diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 20:12:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-14 20:17:24 +0200 |
| commit | 7e944159c63c4d4504cf76f90bb668519c3109af (patch) | |
| tree | 99c916277e5523ae607f50cdde69030513b70d39 /tests/ref/fate/truemotion1-24 | |
| parent | 281bde27894f994d0982ab9283f15d6073ae352c (diff) | |
| parent | 100c70b0481b889d522b4fc2aac5b948ddb05c70 (diff) | |
| download | ffmpeg-7e944159c63c4d4504cf76f90bb668519c3109af.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
vcr1: Add vcr1_ prefixes to all static functions with generic names.
vcr1: Fix return type of common_init to match the function pointer signature.
vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
motion-test: remove disabled code
gxfenc: remove disabled half-implemented MJPEG tag
x86: use more standard construct for setting ASM functions in FFT code
fate: westwood-aud: disable decoding
fate: caf: disable decoding
fate: film-cvid: drop pcm audio and rename test
fate: d-cinema-demux: drop unnecessary flags
fate: split off dpcm-interplay from interplay-mve tests
fate: rename funcom-iss to adpcm-ima-iss
fate: rename cryo-apc to adpcm-ima-apc
fate: rename adpcm-psx-str-v3 to adpcm-xa
fate: split off adpcm-ms-mono test from dxa-feeble
fate: split off adpcm-ima-ws test from vqa-cc
fate: add adpcm-ima-smjpeg test
fate: split off adpcm-ima-amv from amv test
fate: separate bmv audio and video tests
fate: separate delphine-cin audio and video tests
...
Conflicts:
doc/platform.texi
libavcodec/vcr1.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
tests/ref/fate/ea-mad-pcm-planar
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mtv
tests/ref/fate/qtrle-1bit
tests/ref/fate/qtrle-2bit
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/vqa-cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/truemotion1-24')
| -rw-r--r-- | tests/ref/fate/truemotion1-24 | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24 index b41293b542..73bb9e7de4 100644 --- a/tests/ref/fate/truemotion1-24 +++ b/tests/ref/fate/truemotion1-24 @@ -1,46 +1,17 @@ #tb 0: 1/15 -#tb 1: 1/44100 0, 0, 0, 1, 69120, 0x68beb30f -1, 0, 0, 2708, 10832, 0x1597b4c8 -1, 2708, 2708, 2708, 10832, 0xf9479f8b 0, 1, 1, 1, 69120, 0x3976f5cf -1, 5416, 5416, 2708, 10832, 0x8db50e74 0, 2, 2, 1, 69120, 0xf815bc3c -1, 8124, 8124, 2708, 10832, 0x2b33ecbb 0, 3, 3, 1, 69120, 0xa7cc0ae6 -1, 10832, 10832, 2708, 10832, 0x8d0f537b 0, 4, 4, 1, 69120, 0xd85ac282 -1, 13540, 13540, 2708, 10832, 0x922081c7 0, 5, 5, 1, 69120, 0xf7fd7edb -1, 16248, 16248, 2708, 10832, 0x40291f19 0, 6, 6, 1, 69120, 0x433bb6f6 -1, 18956, 18956, 2708, 10832, 0x88f5271a 0, 7, 7, 1, 69120, 0xdbac8bee -1, 21665, 21665, 2708, 10832, 0x55c6bbe5 0, 8, 8, 1, 69120, 0x88e2a799 -1, 24373, 24373, 2708, 10832, 0x9b51ae82 0, 9, 9, 1, 69120, 0x49617b26 -1, 27081, 27081, 2708, 10832, 0xcdf2409b 0, 10, 10, 1, 69120, 0xeb44ca01 -1, 29789, 29789, 2708, 10832, 0x0933b1a4 0, 11, 11, 1, 69120, 0x6fea37e8 -1, 32497, 32497, 2708, 10832, 0x24b77006 -1, 35205, 35205, 2708, 10832, 0xf612fa8a 0, 12, 12, 1, 69120, 0xf55d74c7 -1, 37913, 37913, 2708, 10832, 0x99884b06 0, 13, 13, 1, 69120, 0xb5082ca7 -1, 40621, 40621, 2708, 10832, 0x3c746fbe 0, 14, 14, 1, 69120, 0x5876d758 -1, 43329, 43329, 2708, 10832, 0x05f3b08a 0, 15, 15, 1, 69120, 0x45e7dd5c -1, 46037, 46037, 2708, 10832, 0xa6560483 -1, 48745, 48745, 2708, 10832, 0xd98a8e19 -1, 51453, 51453, 2708, 10832, 0xf98a0b2e -1, 54161, 54161, 2708, 10832, 0xb1039582 -1, 56869, 56869, 2708, 10832, 0x85dd5c3f -1, 59578, 59578, 2708, 10832, 0x19fc801a -1, 62286, 62286, 2708, 10832, 0x95805089 -1, 64994, 64994, 2708, 10832, 0x576fdec3 -1, 67702, 67702, 2708, 10832, 0x704a0905 -1, 70410, 70410, 2708, 10832, 0xf87ce1fa -1, 73118, 73118, 2708, 10832, 0xfc0076b9 |