aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/assdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-14 04:45:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-16 04:25:51 +0200
commitbe2dd2559f54c319f98fc324f84ac2cfb2e50265 (patch)
tree06c70c370131e09d79e12a4e74685ef617bacbf1 /libavcodec/assdec.c
parent50032a75d6cf94f49b8ceee7381d5d68758d7431 (diff)
parent31bc3fb563b12931cc4e2175adbeec92a5de05f1 (diff)
downloadffmpeg-be2dd2559f54c319f98fc324f84ac2cfb2e50265.tar.gz
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8: (23 commits) snow: Check mallocs at init vorbis: Validate that the floor 1 X values contain no duplicates. vorbisenc: check all allocations for failure indeo3: validate new frame size before resetting decoder lavfi: avfilter_merge_formats: handle case where inputs are same rv34: error out on size changes with frame threading rv34: Handle only complete frames in frame-mt. rv34: use AVERROR return values in ff_rv34_decode_frame() vlc/rl: Add ff_ prefix to the nonstatic symbols h263: Add ff_ prefix to nonstatic symbols alsdec: check opt_order. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() lavf: don't segfault when a NULL filename is passed to avformat_open_input() mpegvideo: Don't use ff_mspel_motion() for vc1 imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt eval: fix swapping of lt() and lte() nuv: check RTjpeg header for validity Revert "nuv: check per-frame header for validity." bmpdec: only initialize palette for pal8. sipr: fall back to setting mode based on bit_rate. ... Conflicts: avconv.c libavcodec/dnxhddec.c libavcodec/golomb.h libavcodec/h263.h libavcodec/imgconvert.c libavcodec/mpegvideo_common.h libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/rv34.c libavcodec/sipr.c libavcodec/vorbisdec.c libavcodec/vorbisenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assdec.c')
0 files changed, 0 insertions, 0 deletions