Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:07:23 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:09:12 +0000 (12:09 +0100)
commita66ee3dc87c5650016df7dcd00c4ce0202f0c3ce
tree9b8ef203d5c422de8306806f49cff25fe3b7ef22
parentd57a6fe6abdab934063b809e43096bf887d01696
parentaaaf2dc023d31f30eeec874f24b50f44b9295185
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'

* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
  h263: Check init_get_bits return value

Conflicts:
libavcodec/h263dec.c

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