Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:51:32 +0000 (03:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 01:51:52 +0000 (03:51 +0200)
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/sgidec.c

Simple merge