diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 15:37:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 15:42:14 +0200 |
| commit | 465742bbbec4e875b2dae21f8f2e3092113f589c (patch) | |
| tree | 1966bd4d741119bbfab5efcd3dc6fd14990127aa /cmdutils.c | |
| parent | daa809fd9f1cb74353f99a1e2817bc5fa68ba076 (diff) | |
| parent | 5c54fc6195e52c329b88cf5a56d18628f0ee0029 (diff) | |
| download | ffmpeg-465742bbbec4e875b2dae21f8f2e3092113f589c.tar.gz | |
Merge commit '5c54fc6195e52c329b88cf5a56d18628f0ee0029' into release/1.1
* commit '5c54fc6195e52c329b88cf5a56d18628f0ee0029':
Prepare for 9.8 RELEASE
update Changelog
smacker: check frame size validity
smacker: pad the extradata allocation
smacker: check the return value of smacker_decode_tree
smacker: fix an off by one in huff.length computation
4xm: do not overread the prestream buffer
4xm: validate the buffer size before parsing it
4xm: reject frames not compatible with the declared version
4xm: drop pointless assert
4xm: forward errors from decode_p_block
4xm: fold last_picture lazy allocation in decode_p_frame
4xm: do not overread while parsing header
4xm: refactor fourxm_read_header
4xm: K&R formatting cosmetics
4xm: use the correct logging context
Conflicts:
Changelog
RELEASE
libavcodec/4xm.c
libavcodec/smacker.c
libavformat/4xm.c
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions