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/bmv-audio | |
| 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/bmv-audio')
| -rw-r--r-- | tests/ref/fate/bmv-audio | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/ref/fate/bmv-audio b/tests/ref/fate/bmv-audio new file mode 100644 index 0000000000..746bb0cd7a --- /dev/null +++ b/tests/ref/fate/bmv-audio @@ -0,0 +1,22 @@ +#tb 0: 1/22050 +0, 0, 0, 1856, 7424, 0x18540b36 +0, 1856, 1856, 1824, 7296, 0x5acd2484 +0, 3680, 3680, 1856, 7424, 0xa1bc5c5a +0, 5536, 5536, 1824, 7296, 0x71a02ad1 +0, 7360, 7360, 1856, 7424, 0x09cc32f2 +0, 9216, 9216, 1824, 7296, 0xa3451726 +0, 11040, 11040, 1824, 7296, 0x1eb40a18 +0, 12864, 12864, 1856, 7424, 0xc55a2acf +0, 14720, 14720, 1824, 7296, 0x5b9fad3f +0, 16544, 16544, 1856, 7424, 0xea651ae7 +0, 18400, 18400, 1824, 7296, 0x2bd5ddb6 +0, 20224, 20224, 1856, 7424, 0xde4243b4 +0, 22080, 22080, 1824, 7296, 0x358806d3 +0, 23904, 23904, 1824, 7296, 0x511a144e +0, 25728, 25728, 1856, 7424, 0x887a3e84 +0, 27584, 27584, 1824, 7296, 0xfeae2a0c +0, 29408, 29408, 1856, 7424, 0xa4ea5d22 +0, 31264, 31264, 1824, 7296, 0xb3adf7fa +0, 33088, 33088, 1856, 7424, 0xce995dcc +0, 34944, 34944, 1824, 7296, 0x5b4cf574 +0, 36768, 36768, 1824, 7296, 0x8a70eaf0 |