[FFmpeg-cvslog] Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
Michael Niedermayer
git at videolan.org
Wed Jul 3 13:08:39 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 11:55:45 2013 +0200| [3f0364327c32175221104799958702458be8fbd6] | committer: Michael Niedermayer
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f0364327c32175221104799958702458be8fbd6
---
More information about the ffmpeg-cvslog
mailing list