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/vqa-cc | |
| 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/vqa-cc')
| -rw-r--r-- | tests/ref/fate/vqa-cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc index 401a061b94..8950f9428e 100644 --- a/tests/ref/fate/vqa-cc +++ b/tests/ref/fate/vqa-cc @@ -1,7 +1,5 @@ #tb 0: 1/15 -#tb 1: 1/22050 0, 0, 0, 1, 192000, 0x00000000 -1, 0, 0, 11024, 22048, 0x0665d7f4 0, 1, 1, 1, 192000, 0x00000000 0, 2, 2, 1, 192000, 0x00000000 0, 3, 3, 1, 192000, 0x00000000 @@ -9,72 +7,33 @@ 0, 5, 5, 1, 192000, 0x67256507 0, 6, 6, 1, 192000, 0x74c70e87 0, 7, 7, 1, 192000, 0x8ecdce9a -1, 11024, 11024, 1470, 2940, 0x0f3c64cb 0, 8, 8, 1, 192000, 0xc40f8efd -1, 12494, 12494, 1470, 2940, 0xc90b9e78 0, 9, 9, 1, 192000, 0xb8107dfb -1, 13964, 13964, 1470, 2940, 0x146246a3 0, 10, 10, 1, 192000, 0xb4e504eb -1, 15434, 15434, 1470, 2940, 0xd22c714e 0, 11, 11, 1, 192000, 0x0c7fdb95 -1, 16904, 16904, 1470, 2940, 0xd86b681e 0, 12, 12, 1, 192000, 0x58c9f045 -1, 18374, 18374, 1470, 2940, 0x12ec8186 0, 13, 13, 1, 192000, 0xcba9d0e9 -1, 19844, 19844, 1470, 2940, 0x69aa85b6 0, 14, 14, 1, 192000, 0x392a20f6 -1, 21314, 21314, 1470, 2940, 0xb24d33b0 0, 15, 15, 1, 192000, 0xc37905cc -1, 22784, 22784, 1470, 2940, 0x3f7b0f0d 0, 16, 16, 1, 192000, 0xe278cf95 -1, 24254, 24254, 1470, 2940, 0x64f10f7e 0, 17, 17, 1, 192000, 0x3d03b01d -1, 25724, 25724, 1470, 2940, 0xd6ea379a 0, 18, 18, 1, 192000, 0x16a26f28 -1, 27194, 27194, 1470, 2940, 0x7c38e830 0, 19, 19, 1, 192000, 0xdd17f51c -1, 28664, 28664, 1470, 2940, 0xc28ff132 0, 20, 20, 1, 192000, 0x19703b85 -1, 30134, 30134, 1470, 2940, 0xe7b11629 0, 21, 21, 1, 192000, 0xe51f0e70 -1, 31604, 31604, 1470, 2940, 0xeb86fdcb 0, 22, 22, 1, 192000, 0x6f94ad2a -1, 33074, 33074, 1470, 2940, 0x5508f586 0, 23, 23, 1, 192000, 0x71e449f1 -1, 34544, 34544, 1470, 2940, 0xf4fa1f1b 0, 24, 24, 1, 192000, 0x1dcacc52 -1, 36014, 36014, 1470, 2940, 0x9e5ff976 0, 25, 25, 1, 192000, 0x49c23f58 -1, 37484, 37484, 1470, 2940, 0xcfc4e08f 0, 26, 26, 1, 192000, 0x4ce61551 -1, 38954, 38954, 1470, 2940, 0x74bde7ed 0, 27, 27, 1, 192000, 0xe54832d5 -1, 40424, 40424, 1470, 2940, 0x3e4ae245 0, 28, 28, 1, 192000, 0xbae28a59 -1, 41894, 41894, 1470, 2940, 0x4c6a8e56 0, 29, 29, 1, 192000, 0xe8a4efbe -1, 43364, 43364, 1470, 2940, 0xa09d86ab 0, 30, 30, 1, 192000, 0xe9e96883 -1, 44834, 44834, 1470, 2940, 0xc8531912 0, 31, 31, 1, 192000, 0xa5468c49 -1, 46304, 46304, 1470, 2940, 0xa5f266aa 0, 32, 32, 1, 192000, 0x7ec6936a -1, 47774, 47774, 1470, 2940, 0x587a4187 0, 33, 33, 1, 192000, 0x46e53ee4 -1, 49244, 49244, 1470, 2940, 0x14752d45 0, 34, 34, 1, 192000, 0x937b168a -1, 50714, 50714, 1470, 2940, 0x558cde10 0, 35, 35, 1, 192000, 0xed76cec4 -1, 52184, 52184, 1470, 2940, 0x735fee38 0, 36, 36, 1, 192000, 0x4b9f454d -1, 53654, 53654, 1470, 2940, 0xac8bb6c8 0, 37, 37, 1, 192000, 0xb58c1566 -1, 55124, 55124, 1470, 2940, 0xa503c73b -1, 56594, 56594, 1470, 2940, 0x7cd588a3 -1, 58064, 58064, 1470, 2940, 0xa6974b04 -1, 59534, 59534, 1470, 2940, 0xbf448241 -1, 61004, 61004, 1470, 2940, 0x2a5c2759 -1, 62474, 62474, 1470, 2940, 0xd0de5ce0 -1, 63944, 63944, 1470, 2940, 0xc0486649 -1, 65414, 65414, 1470, 2940, 0x48b040af -1, 66884, 66884, 1470, 2940, 0x82a338a9 |