aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/act.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-12 16:51:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-12 16:51:26 +0100
commitf479c178943fdaee5f8d92f88658c57bec3e40b3 (patch)
treeeee37f3280b03504e69abc0cf7c7f9a49129cf3b /libavformat/act.c
parent1203e92181b4c4af4ba1aa0edc1da3ae8447f9b4 (diff)
parent65830277d2d2ee3658e1f070a61044fff261ed3e (diff)
downloadffmpeg-f479c178943fdaee5f8d92f88658c57bec3e40b3.tar.gz
Merge commit '65830277d2d2ee3658e1f070a61044fff261ed3e' into release/1.1
* commit '65830277d2d2ee3658e1f070a61044fff261ed3e': prores: Add a codepath for decoding errors nut: Fix unchecked allocations avi: directly resync on DV in AVI read failure mov: Don't allocate arrays with av_malloc that will be realloced shorten: Extend fixed_coeffs to properly support pred_order 0 Prepare for 9.11 RELEASE avi: properly fail if the dv demuxer is missing prores: Reject negative run and level values audio_mix: fix channel order in mix_1_to_2_fltp_flt_c indeo4: Check the inherited quant_mat Conflicts: RELEASE libavcodec/indeo4.c libavcodec/shorten.c libavformat/nut.c libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/act.c')
0 files changed, 0 insertions, 0 deletions