diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 06:32:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 06:32:48 +0100 |
| commit | cb8180885f225df6ee6f03ac157aa7617a06ff50 (patch) | |
| tree | ff2b46d39aac68b17243d63a3400fb32d9ddfb59 /libavcodec/mjpeg.c | |
| parent | e2781db62a406114519d55c31dd534db6d60dd0d (diff) | |
| parent | 62ed6da016b789eee00e0fff517df4a254e12e5d (diff) | |
| download | ffmpeg-cb8180885f225df6ee6f03ac157aa7617a06ff50.tar.gz | |
Merge commit '62ed6da016b789eee00e0fff517df4a254e12e5d' into release/1.1
* commit '62ed6da016b789eee00e0fff517df4a254e12e5d':
h264: check that an IDR NAL only contains I slices
mov: Free an earlier allocated array if allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.c')
0 files changed, 0 insertions, 0 deletions