[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 24 12:01:29 2013 +0200| [7dec8512be12675e84213c744c1aa511bed4d057] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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