1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer a4a16821d7 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>
2013-07-03 14:38:37 +02:00
..
2013-06-02 11:25:56 +02:00
2013-06-30 01:35:22 +02:00
2013-05-22 21:30:28 +02:00
2013-06-13 21:49:18 +00:00
2013-06-12 16:23:49 +02:00
2013-05-28 13:35:09 +02:00
2013-05-23 10:05:28 +00:00
2013-05-30 18:38:04 +02:00
2013-07-02 03:27:14 +02:00
2013-05-31 03:10:08 +02:00
2013-06-06 22:02:54 +02:00
2013-05-26 21:57:28 +00:00
2013-05-22 20:24:50 +02:00
2013-05-22 20:24:50 +02:00
2013-05-23 20:38:53 +00:00
2013-05-22 17:40:12 +02:00
2013-06-04 17:25:32 +00:00
2013-06-13 21:49:18 +00:00
2013-06-13 21:49:18 +00:00
2013-06-02 15:16:52 +00:00
2013-06-21 03:22:02 +02:00
2013-05-28 13:56:29 +03:00
2013-05-21 17:49:29 +00:00
2013-05-29 22:31:16 +02:00