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/dxa-feeble | |
| 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/dxa-feeble')
| -rw-r--r-- | tests/ref/fate/dxa-feeble | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/tests/ref/fate/dxa-feeble b/tests/ref/fate/dxa-feeble index 6aaea29d16..74b43dcf22 100644 --- a/tests/ref/fate/dxa-feeble +++ b/tests/ref/fate/dxa-feeble @@ -1,67 +1,21 @@ #tb 0: 1/10 -#tb 1: 1/11025 0, 0, 0, 1, 921600, 0x0d03844f -1, 0, 0, 500, 1000, 0x64cd9403 -1, 500, 500, 500, 1000, 0xa4ef8a9d -1, 1000, 1000, 500, 1000, 0x75c19868 0, 1, 1, 1, 921600, 0x0d03844f -1, 1500, 1500, 500, 1000, 0x93db6f79 -1, 2000, 2000, 500, 1000, 0x6835625d 0, 2, 2, 1, 921600, 0x649cdcea -1, 2500, 2500, 500, 1000, 0xb3affa8f -1, 3000, 3000, 500, 1000, 0x159fdcc8 0, 3, 3, 1, 921600, 0x649cdcea -1, 3500, 3500, 500, 1000, 0x79f9f7f1 -1, 4000, 4000, 500, 1000, 0xd7d1131e 0, 4, 4, 1, 921600, 0x9c7f22e8 -1, 4500, 4500, 500, 1000, 0x52a6f797 -1, 5000, 5000, 500, 1000, 0x748202ca -1, 5500, 5500, 500, 1000, 0x0ef92449 0, 5, 5, 1, 921600, 0x9c7f22e8 -1, 6000, 6000, 500, 1000, 0x6a3760ab -1, 6500, 6500, 500, 1000, 0xce5c5abf 0, 6, 6, 1, 921600, 0x3451514a -1, 7000, 7000, 500, 1000, 0x23396792 -1, 7500, 7500, 500, 1000, 0xa5276238 0, 7, 7, 1, 921600, 0x3451514a -1, 8000, 8000, 500, 1000, 0x288adf1b -1, 8500, 8500, 500, 1000, 0xe7de6fb2 0, 8, 8, 1, 921600, 0x8f19f600 -1, 9000, 9000, 500, 1000, 0x2c2c707f -1, 9500, 9500, 500, 1000, 0xd66d6daf 0, 9, 9, 1, 921600, 0x8f19f600 -1, 10000, 10000, 500, 1000, 0xbcea7d64 -1, 10500, 10500, 500, 1000, 0x766feea5 -1, 11000, 11000, 500, 1000, 0xd2e1d63a 0, 10, 10, 1, 921600, 0x07e7445b -1, 11500, 11500, 500, 1000, 0x2f7ef4ed -1, 12000, 12000, 500, 1000, 0xb655cba4 0, 11, 11, 1, 921600, 0x07e7445b -1, 12500, 12500, 500, 1000, 0x4507d37b -1, 13000, 13000, 500, 1000, 0x0c57f794 0, 12, 12, 1, 921600, 0x873d1227 -1, 13500, 13500, 500, 1000, 0x0ecbe5cc -1, 14000, 14000, 500, 1000, 0x9bf6e345 0, 13, 13, 1, 921600, 0x873d1227 -1, 14500, 14500, 500, 1000, 0xc461443c -1, 15000, 15000, 500, 1000, 0xad9657bf 0, 14, 14, 1, 921600, 0xbef62d86 -1, 15500, 15500, 500, 1000, 0x466fe91c -1, 16000, 16000, 500, 1000, 0x9ee377fe -1, 16500, 16500, 500, 1000, 0x09956428 0, 15, 15, 1, 921600, 0xbef62d86 -1, 17000, 17000, 500, 1000, 0x9b285f0a -1, 17500, 17500, 500, 1000, 0x0a3e61a6 0, 16, 16, 1, 921600, 0xcf84fee4 -1, 18000, 18000, 500, 1000, 0xacc25d6b -1, 18500, 18500, 500, 1000, 0x377be319 0, 17, 17, 1, 921600, 0xcf84fee4 -1, 19000, 19000, 500, 1000, 0xe4890504 -1, 19500, 19500, 500, 1000, 0xe90a6497 0, 18, 18, 1, 921600, 0x5639e670 -1, 20000, 20000, 500, 1000, 0xd00fe950 -1, 20500, 20500, 500, 1000, 0xf195eb44 0, 19, 19, 1, 921600, 0x5639e670 -1, 21000, 21000, 500, 1000, 0xa491f3ef -1, 21500, 21500, 500, 1000, 0x2c036e18 -1, 22000, 22000, 500, 1000, 0x52d65e2a |