mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-06 15:49:50 +08:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: smacker: Sanity check huffman tables found in the headers. smacker: remove dead store qdm2: Check data block size for bytes to bits overflow. mxfdec: Fix files with essence containers larger than 2 GiB. mxfdec: Employ correct printf conversion specifiers for POSIX int types. vc1: always read the bfraction element for interlaced fields fate: add XWD image regression test lavf: prevent infinite loops while flushing in avformat_find_stream_info matroskadec: Pad AAC extradata. ismindex: Fix build on mingw Conflicts: libavformat/mxfdec.c libavformat/utils.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@ -187,6 +187,10 @@ if [ -n "$do_dpx" ] ; then
|
||||
do_image_formats dpx
|
||||
fi
|
||||
|
||||
if [ -n "$do_xwd" ] ; then
|
||||
do_image_formats xwd
|
||||
fi
|
||||
|
||||
# audio only
|
||||
|
||||
if [ -n "$do_wav" ] ; then
|
||||
|
Reference in New Issue
Block a user