[FFmpeg-cvslog] Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
Michael Niedermayer
git at videolan.org
Wed Jul 3 14:45:42 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 14:38:37 2013 +0200| [a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc] | committer: Michael Niedermayer
Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
* commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
jpeg2000: check len before parsing header
jpeg2000: Check component number in get_coc() and get_qcc()
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc
---
More information about the ffmpeg-cvslog
mailing list