[FFmpeg-cvslog] Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
Michael Niedermayer
git at videolan.org
Thu Sep 12 14:39:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 14:33:25 2013 +0200| [72abfba88458b85d24d8b2cebf7f2c06166a834b] | committer: Michael Niedermayer
Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
aic: Validate values read from the bitstream
Conflicts:
libavcodec/aic.c
See: 657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72abfba88458b85d24d8b2cebf7f2c06166a834b
---
More information about the ffmpeg-cvslog
mailing list