aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ass.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-29 02:29:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-29 02:35:24 +0200
commitbe90f0279d0784c396407e152a8d817953381886 (patch)
treef42c67762d6851b9002e31901632decb0e3b9ebd /libavcodec/ass.c
parentf3c300d0a4d326c19013d6ecc8ce7d1d25729aa5 (diff)
parent43c0a87279e717c1384314c6da7155c306ee7c60 (diff)
downloadffmpeg-be90f0279d0784c396407e152a8d817953381886.tar.gz
Merge commit '43c0a87279e717c1384314c6da7155c306ee7c60' into release/0.10
* commit '43c0a87279e717c1384314c6da7155c306ee7c60': qdm2: check that the FFT size is a power of 2 indeo3: switch parsing the header to bytestream2 indeo3: check motion vectors. rv10: check that extradata is large enough indeo3: fix data size check lavf: make sure stream probe data gets freed. dfa: check for invalid access in decode_wdlt(). xmv: check audio track parameters validity. bmv: check for len being valid in bmv_decode_frame(). xmv: do not leak memory in the error paths in xmv_read_header() avfiltergraph: check for sws opts being non-NULL before using them. oma: Validate sample rates Prepare for 0.8.7 Release Conflicts: RELEASE libavcodec/indeo3.c libavfilter/avfiltergraph.c libavformat/utils.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.c')
0 files changed, 0 insertions, 0 deletions