diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 02:56:12 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 02:56:12 +0100 |
commit | 597d709eb42ae0fbe9e4b97fb1a5c04544fdb04b (patch) | |
tree | d82971c3ab22ed7059aa45c48ac3ee10c8509a33 /libavformat/mpeg.h | |
parent | fe9cbf582b094dff507df287bfa61b54755fa6c9 (diff) | |
parent | aa45b90804ab21175b8c116bd8e5eb4b4e85fbcb (diff) | |
download | ffmpeg-597d709eb42ae0fbe9e4b97fb1a5c04544fdb04b.tar.gz |
Merge commit 'aa45b90804ab21175b8c116bd8e5eb4b4e85fbcb' into release/0.8
* commit 'aa45b90804ab21175b8c116bd8e5eb4b4e85fbcb': (22 commits)
alsdec: Check k used for rice decoder.
cavsdec: check for changing w/h.
avidec: use actually read size instead of requested size
wmaprodec: check num_vec_coeffs for validity
lagarith: check count before writing zeros.
indeo5: check tile size in decode_mb_info().
indeo5: prevent null pointer dereference on broken files
indeo: check for invalid motion vectors
indeo: clear allocated band buffers
indeo: check custom Huffman tables for errors
dfa: add some checks to ensure that decoder won't write past frame end
dfa: check that the caller set width/height properly.
bytestream: add a new set of bytestream functions with overread checking
avsdec: Set dimensions instead of relying on the demuxer.
lavfi: avfilter_merge_formats: handle case where inputs are same
rv34: use AVERROR return values in ff_rv34_decode_frame()
h263: Add ff_ prefix to nonstatic symbols
eval: fix swapping of lt() and lte()
bmpdec: only initialize palette for pal8.
vc1dec: add flush function for WMV9 and VC-1 decoders
...
Conflicts:
libavcodec/avs.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.h')
0 files changed, 0 insertions, 0 deletions