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-video | |
| 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-video')
| -rw-r--r-- | tests/ref/fate/bmv-video | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/ref/fate/bmv-video b/tests/ref/fate/bmv-video new file mode 100644 index 0000000000..f19cd45edc --- /dev/null +++ b/tests/ref/fate/bmv-video @@ -0,0 +1,22 @@ +#tb 0: 1/12 +0, 0, 0, 1, 823680, 0xddb8a306 +0, 1, 1, 1, 823680, 0xa95375c8 +0, 2, 2, 1, 823680, 0xa95375c8 +0, 3, 3, 1, 823680, 0xb6f78afe +0, 4, 4, 1, 823680, 0xb6f78afe +0, 5, 5, 1, 823680, 0x45b9c8f0 +0, 6, 6, 1, 823680, 0x45b9c8f0 +0, 7, 7, 1, 823680, 0x7653d8e9 +0, 8, 8, 1, 823680, 0x7653d8e9 +0, 9, 9, 1, 823680, 0xf1e2fd73 +0, 10, 10, 1, 823680, 0xf1e2fd73 +0, 11, 11, 1, 823680, 0x6d2deab3 +0, 12, 12, 1, 823680, 0x6d2deab3 +0, 13, 13, 1, 823680, 0x37fd33ce +0, 14, 14, 1, 823680, 0x37fd33ce +0, 15, 15, 1, 823680, 0x0a8e0ab9 +0, 16, 16, 1, 823680, 0x0a8e0ab9 +0, 17, 17, 1, 823680, 0x991bb2b0 +0, 18, 18, 1, 823680, 0x991bb2b0 +0, 19, 19, 1, 823680, 0xb8397c8c +0, 20, 20, 1, 823680, 0xb8397c8c |