diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-27 01:42:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-27 02:09:58 +0100 |
| commit | 01fcbdf9cedcf14418b5886205261e532167f949 (patch) | |
| tree | 8022d29d337142d81b3a05a0927a5ec90a67b25f /tests | |
| parent | a8ae00b68cb9895f4a819950dbc740bc8fc7c1e1 (diff) | |
| parent | 9adf25c1cf78dbf1d71bf386c49dc74cb8a60df0 (diff) | |
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavf-regression.sh | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/xwd | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index af34e86893..884b10b989 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -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 diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd new file mode 100644 index 0000000000..6ba88cd2fd --- /dev/null +++ b/tests/ref/lavf/xwd @@ -0,0 +1,3 @@ +0ab6cd4fe5fe85a3f3e87508c2eadfa0 *./tests/data/images/xwd/02.xwd +./tests/data/images/xwd/%02d.xwd CRC=0x6da01946 +304239 ./tests/data/images/xwd/02.xwd |