aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/movsub_bsf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-07 13:37:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-07 13:50:24 +0200
commitfa8511851090537f6898fc50d7e6cf56841cf6ab (patch)
treecc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavcodec/movsub_bsf.c
parenta7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff)
parent9afb7061f938831248942050cfdb449e014ed427 (diff)
downloadffmpeg-fa8511851090537f6898fc50d7e6cf56841cf6ab.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mov_chan: Pass a separate AVIOContext for reading af_asyncts: check return value from lavr when flushing. mss2: simplify loop in decode_rle() mss12: avoid unnecessary division in arith*_get_bit() mss2: do not try to read too many palette entries mpegvideo: set AVFrame fields to NULL after freeing the base memory configure: Set the right cc_e flags for msvc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movsub_bsf.c')
0 files changed, 0 insertions, 0 deletions