[FFmpeg-cvslog] Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
Michael Niedermayer
git at videolan.org
Tue May 21 12:01:46 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 21 11:51:49 2013 +0200| [6ef7b6af6be0a1f8d4b355ccb692289857d1f967] | committer: Michael Niedermayer
Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
Conflicts:
libavcodec/mjpegdec.c
See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ef7b6af6be0a1f8d4b355ccb692289857d1f967
---
More information about the ffmpeg-cvslog
mailing list