diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-04 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-04 02:34:14 +0100 |
| commit | 3b46daa31f566f9c6ef1518c1767b12e0ab2f62a (patch) | |
| tree | e0baf74dc919859429488d4ea73cfc92e96db414 /tests/ref/fate/bmv | |
| parent | 670229ef4392fa88d6add97c0eef412a5d6083c0 (diff) | |
| parent | 6f1a5e8d6b7e085171a49b8ce6a371a7c9643764 (diff) | |
| download | ffmpeg-3b46daa31f566f9c6ef1518c1767b12e0ab2f62a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove debug message in dsputil_init().
movdec: Avoid av_malloc(0) in stss
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
build: Drop unused X86-OBJS variable.
avconv: remove debugging cruft from do_video_out().
avconv: factorize setting stream_index for the output packet.
frame{crc/md5}: set the stream timebase from codec timebase.
apedec: remove unneeded #include of get_bits.h and associated macro
apedec: av_fast_malloc() instead of av_realloc()
apedec: fix handling of packet sizes that are not a multiple of 4 bytes
Conflicts:
libavcodec/apedec.c
tests/ref/fate/4xm-1
tests/ref/fate/4xm-2
tests/ref/fate/aasc
tests/ref/fate/armovie-escape124
tests/ref/fate/bethsoft-vid
tests/ref/fate/cljr
tests/ref/fate/creatureshock-avs
tests/ref/fate/cscd
tests/ref/fate/cvid-partial
tests/ref/fate/deluxepaint-anm
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/flic-af11-palette-change
tests/ref/fate/flic-magiccarpet
tests/ref/fate/fraps-v2
tests/ref/fate/fraps-v3
tests/ref/fate/h264-lossless
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mimic
tests/ref/fate/motionpixels
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/msvideo1-16bit
tests/ref/fate/mtv
tests/ref/fate/nuv
tests/ref/fate/pictor
tests/ref/fate/prores-alpha
tests/ref/fate/ptx
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/quickdraw
tests/ref/fate/rpza
tests/ref/fate/sierra-vmd
tests/ref/fate/targa-conformance-CCM8
tests/ref/fate/targa-conformance-UCM8
tests/ref/fate/tiertex-seq
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/tscc-15bit
tests/ref/fate/tscc-32bit
tests/ref/fate/v210
tests/ref/fate/vc1-ism
tests/ref/fate/vc1_sa00040
tests/ref/fate/vc1_sa00050
tests/ref/fate/vc1_sa10091
tests/ref/fate/vc1_sa20021
tests/ref/fate/vmnc-16bit
tests/ref/fate/vmnc-32bit
tests/ref/fate/vp5
tests/ref/fate/vp8-sign-bias
tests/ref/fate/vqa-cc
tests/ref/fate/wmv8-drm
tests/ref/fate/yop
tests/ref/fate/zmbv-8bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/bmv')
| -rw-r--r-- | tests/ref/fate/bmv | 86 |
1 files changed, 44 insertions, 42 deletions
diff --git a/tests/ref/fate/bmv b/tests/ref/fate/bmv index 4e461650e8..2ea4862ea3 100644 --- a/tests/ref/fate/bmv +++ b/tests/ref/fate/bmv @@ -1,42 +1,44 @@ -0, 0, 823680, 0xddb8a306 -1, 0, 7424, 0x18540b36 -0, 7500, 823680, 0xa95375c8 -1, 7576, 7296, 0x5acd2484 -0, 15000, 823680, 0xa95375c8 -1, 15020, 7424, 0xa1bc5c5a -0, 22500, 823680, 0xb6f78afe -1, 22596, 7296, 0x71a02ad1 -0, 30000, 823680, 0xb6f78afe -1, 30041, 7424, 0x09cc32f2 -0, 37500, 823680, 0x45b9c8f0 -1, 37616, 7296, 0xa3451726 -0, 45000, 823680, 0x45b9c8f0 -1, 45061, 7296, 0x1eb40a18 -0, 52500, 823680, 0x7653d8e9 -1, 52506, 7424, 0xc55a2acf -0, 60000, 823680, 0x7653d8e9 -1, 60082, 7296, 0x5b9fad3f -0, 67500, 823680, 0xf1e2fd73 -1, 67527, 7424, 0xea651ae7 -0, 75000, 823680, 0xf1e2fd73 -1, 75102, 7296, 0x2bd5ddb6 -0, 82500, 823680, 0x6d2deab3 -1, 82547, 7424, 0xde4243b4 -0, 90000, 823680, 0x6d2deab3 -1, 90122, 7296, 0x358806d3 -0, 97500, 823680, 0x37fd33ce -1, 97567, 7296, 0x511a144e -0, 105000, 823680, 0x37fd33ce -1, 105012, 7424, 0x887a3e84 -0, 112500, 823680, 0x0a8e0ab9 -1, 112588, 7296, 0xfeae2a0c -0, 120000, 823680, 0x0a8e0ab9 -1, 120033, 7424, 0xa4ea5d22 -0, 127500, 823680, 0x991bb2b0 -1, 127608, 7296, 0xb3adf7fa -0, 135000, 823680, 0x991bb2b0 -1, 135053, 7424, 0xce995dcc -0, 142500, 823680, 0xb8397c8c -1, 142629, 7296, 0x5b4cf574 -0, 150000, 823680, 0xb8397c8c -1, 150073, 7296, 0x8a70eaf0 +#tb 0: 1/12 +#tb 1: 1/22050 +0, 0, 0, 1, 823680, 0xddb8a306 +1, 0, 0, 1856, 7424, 0x18540b36 +0, 1, 1, 1, 823680, 0xa95375c8 +1, 1856, 1856, 1824, 7296, 0x5acd2484 +0, 2, 2, 1, 823680, 0xa95375c8 +1, 3680, 3680, 1856, 7424, 0xa1bc5c5a +0, 3, 3, 1, 823680, 0xb6f78afe +1, 5536, 5536, 1824, 7296, 0x71a02ad1 +0, 4, 4, 1, 823680, 0xb6f78afe +1, 7360, 7360, 1856, 7424, 0x09cc32f2 +0, 5, 5, 1, 823680, 0x45b9c8f0 +1, 9216, 9216, 1824, 7296, 0xa3451726 +0, 6, 6, 1, 823680, 0x45b9c8f0 +1, 11040, 11040, 1824, 7296, 0x1eb40a18 +0, 7, 7, 1, 823680, 0x7653d8e9 +1, 12864, 12864, 1856, 7424, 0xc55a2acf +0, 8, 8, 1, 823680, 0x7653d8e9 +1, 14720, 14720, 1824, 7296, 0x5b9fad3f +0, 9, 9, 1, 823680, 0xf1e2fd73 +1, 16544, 16544, 1856, 7424, 0xea651ae7 +0, 10, 10, 1, 823680, 0xf1e2fd73 +1, 18400, 18400, 1824, 7296, 0x2bd5ddb6 +0, 11, 11, 1, 823680, 0x6d2deab3 +1, 20224, 20224, 1856, 7424, 0xde4243b4 +0, 12, 12, 1, 823680, 0x6d2deab3 +1, 22080, 22080, 1824, 7296, 0x358806d3 +0, 13, 13, 1, 823680, 0x37fd33ce +1, 23904, 23904, 1824, 7296, 0x511a144e +0, 14, 14, 1, 823680, 0x37fd33ce +1, 25728, 25728, 1856, 7424, 0x887a3e84 +0, 15, 15, 1, 823680, 0x0a8e0ab9 +1, 27584, 27584, 1824, 7296, 0xfeae2a0c +0, 16, 16, 1, 823680, 0x0a8e0ab9 +1, 29408, 29408, 1856, 7424, 0xa4ea5d22 +0, 17, 17, 1, 823680, 0x991bb2b0 +1, 31264, 31264, 1824, 7296, 0xb3adf7fa +0, 18, 18, 1, 823680, 0x991bb2b0 +1, 33088, 33088, 1856, 7424, 0xce995dcc +0, 19, 19, 1, 823680, 0xb8397c8c +1, 34944, 34944, 1824, 7296, 0x5b4cf574 +0, 20, 20, 1, 823680, 0xb8397c8c +1, 36768, 36768, 1824, 7296, 0x8a70eaf0 |