diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:38:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:38:37 +0200 |
| commit | a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc (patch) | |
| tree | 0df0a4ee73ad8a56f5891b89625d1ccf56fa8800 /libavcodec/rangecoder.c | |
| parent | 2cad1ea29e4df69a556a95e942968184493fb249 (diff) | |
| parent | fd54dd028bc9f7bfb80ebf823a533dc84b73f936 (diff) | |
| download | ffmpeg-a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions