Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 09:57:14 +0000 (10:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 10:21:52 +0000 (11:21 +0100)
* qatar/master:
  h263dec: sanitize a condition.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h263dec.c

Simple merge