[FFmpeg-cvslog] Merge commit '711c970168297683860422e95d6b7e37ee3c8367'
Michael Niedermayer
git at videolan.org
Tue Sep 17 15:44:39 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 15:37:04 2013 +0200| [b3dfda8a410dba1ff2a80b4e243befce1d5f79c5] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3dfda8a410dba1ff2a80b4e243befce1d5f79c5
---
More information about the ffmpeg-cvslog
mailing list