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)
commit5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5
treefcd3b2bd03761e4de6b971ecb7f19d2f25d87a11
parent013aa222c624c62fd61eb033803bc297b6681ea0
parent6d9ccee4519f41155c88655c77bfb1ef085797fd
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
libavcodec/sgidec.c

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