diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:36:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:43:54 +0200 |
| commit | c40798441f47341c310b38e8f329cfb943924faf (patch) | |
| tree | c23fbec614c59bcf14c7377d1c6ff7abdfa34353 /tests | |
| parent | c96786008172f669e546ca987e7aaa3c3469be71 (diff) | |
| parent | fd0c3403f611d31b944216cfa1585a2d28f7f0da (diff) | |
| download | ffmpeg-c40798441f47341c310b38e8f329cfb943924faf.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket
Politic commits that have not been pulled:
Update regtest checksums after revision 6001dad.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/lavf/mxf | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 58e75d17cd..d4bbe2f25e 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,6 +1,6 @@ -785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf +6e9bd63c5cadd7550ad313553ebf665f *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x4ace0849 -b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10 +e7168856f2b54c6272685967e707fb21 *./tests/data/lavf/lavf.mxf_d10 5330989 ./tests/data/lavf/lavf.mxf_d10 ./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index e4bdb631df..4028be0a6e 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -e8d609b8a5b5854a4485718434b287f7 *./tests/data/lavf/lavf.ts +1cebaf8b13700a3360e0c32551e36646 *./tests/data/lavf/lavf.ts 406644 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x133216c1 |