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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 10:57:14 2013 +0100| [03beb5792a3c714715c795b5c680d39bca6b0427] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dec: sanitize a condition.

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

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