Merge commit '711c970168297683860422e95d6b7e37ee3c8367'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:37:04 +0000 (15:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:38:09 +0000 (15:38 +0200)
commitb3dfda8a410dba1ff2a80b4e243befce1d5f79c5
treea8b57b7522e4e897f9eb95f48450abd2a5c3ec51
parent2c8d876dea153b387c57d9ec5809780c21414b84
parent711c970168297683860422e95d6b7e37ee3c8367
Merge commit '711c970168297683860422e95d6b7e37ee3c8367'

* commit '711c970168297683860422e95d6b7e37ee3c8367':
  rv34: Check the return value from ff_rv34_decode_init

Conflicts:
libavcodec/rv30.c
libavcodec/rv40.c

See: b86651a208ee67666a7305b002bc9f14b21dae7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv30.c
libavcodec/rv40.c