[FFmpeg-cvslog] Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:51:32 2014 +0200| [5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5
---