diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 16:29:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 16:29:54 +0200 |
| commit | 36487066ee044d580ce2fdf7aa3989a0036e9313 (patch) | |
| tree | 5ce45d234b430c833a49b36cf522745e002eee85 /libavcodec/mjpegdec.h | |
| parent | fe8243d7a9e3dae000389ca2020f26679c779f04 (diff) | |
| parent | 15c2e8027f4827018608badb1bff1294af1810e4 (diff) | |
| download | ffmpeg-36487066ee044d580ce2fdf7aa3989a0036e9313.tar.gz | |
Merge commit '15c2e8027f4827018608badb1bff1294af1810e4' into release/0.10
* commit '15c2e8027f4827018608badb1bff1294af1810e4':
wav: do not fail on empty INFO tags
cavsdec: check for changing w/h.
indeo4: update AVCodecContext width/height on size change
avidec: use actually read size instead of requested size
wmaprodec: check num_vec_coeffs for validity
lagarith: check count before writing zeros.
indeo3: fix out of cell write.
indeo5: check tile size in decode_mb_info().
indeo5: prevent null pointer dereference on broken files
indeo5dec: Make sure we have had a valid gop header.
indeo4/5: check empty tile size in decode_mb_info().
ivi_common: make ff_ivi_process_empty_tile() static.
Conflicts:
libavcodec/indeo5.c
libavformat/wav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
0 files changed, 0 insertions, 0 deletions