-
Michael Niedermayer authored
* commit '711c9701': rv34: Check the return value from ff_rv34_decode_init Conflicts: libavcodec/rv30.c libavcodec/rv40.c See: b86651a2Merged-by: Michael Niedermayer <michaelni@gmx.at>
b3dfda8a
* commit '711c9701': rv34: Check the return value from ff_rv34_decode_init Conflicts: libavcodec/rv30.c libavcodec/rv40.c See: b86651a2Merged-by: Michael Niedermayer <michaelni@gmx.at>