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/flic-magiccarpet | |
| 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/flic-magiccarpet')
| -rw-r--r-- | tests/ref/fate/flic-magiccarpet | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/tests/ref/fate/flic-magiccarpet b/tests/ref/fate/flic-magiccarpet index 0a5262f1bf..23a93427db 100644 --- a/tests/ref/fate/flic-magiccarpet +++ b/tests/ref/fate/flic-magiccarpet @@ -1,42 +1,43 @@ -0, 0, 192000, 0x00000000 -0, 6429, 192000, 0x03567eeb -0, 12857, 192000, 0xe73db12c -0, 19286, 192000, 0x7cefe740 -0, 25714, 192000, 0xb769f827 -0, 32143, 192000, 0x71669dea -0, 38571, 192000, 0xc203b934 -0, 45000, 192000, 0x30671ee2 -0, 51429, 192000, 0xaea33a1b -0, 57857, 192000, 0x50f220c3 -0, 64286, 192000, 0x1ddd090f -0, 70714, 192000, 0x17ac22a4 -0, 77143, 192000, 0x19f9f412 -0, 83571, 192000, 0xa2df0e55 -0, 90000, 192000, 0x5abcd663 -0, 96429, 192000, 0x5b09b38d -0, 102857, 192000, 0x894d1f43 -0, 109286, 192000, 0xbc95caaf -0, 115714, 192000, 0xeaca27fc -0, 122143, 192000, 0x49c5ccb4 -0, 128571, 192000, 0x8b3e78b0 -0, 135000, 192000, 0x1645d3ae -0, 141429, 192000, 0x4407da0f -0, 147857, 192000, 0x7d0826ac -0, 154286, 192000, 0xc17ec1b8 -0, 160714, 192000, 0x4a82520d -0, 167143, 192000, 0xa89f0e2f -0, 173571, 192000, 0xd58b537a -0, 180000, 192000, 0x7123dafe -0, 186429, 192000, 0x15d1d065 -0, 192857, 192000, 0xa86873f6 -0, 199286, 192000, 0x32704a91 -0, 205714, 192000, 0xbf2b63d7 -0, 212143, 192000, 0xb98e0126 -0, 218571, 192000, 0x412a03ee -0, 225000, 192000, 0x601ad161 -0, 231429, 192000, 0x01ead407 -0, 237857, 192000, 0x75a7bbe5 -0, 244286, 192000, 0x155ea759 -0, 250714, 192000, 0xe3a0a6aa -0, 257143, 192000, 0x2b5a5770 -0, 263571, 192000, 0x00000000 +#tb 0: 1/14 +0, 0, 0, 1, 192000, 0x00000000 +0, 1, 1, 1, 192000, 0x03567eeb +0, 2, 2, 1, 192000, 0xe73db12c +0, 3, 3, 1, 192000, 0x7cefe740 +0, 4, 4, 1, 192000, 0xb769f827 +0, 5, 5, 1, 192000, 0x71669dea +0, 6, 6, 1, 192000, 0xc203b934 +0, 7, 7, 1, 192000, 0x30671ee2 +0, 8, 8, 1, 192000, 0xaea33a1b +0, 9, 9, 1, 192000, 0x50f220c3 +0, 10, 10, 1, 192000, 0x1ddd090f +0, 11, 11, 1, 192000, 0x17ac22a4 +0, 12, 12, 1, 192000, 0x19f9f412 +0, 13, 13, 1, 192000, 0xa2df0e55 +0, 14, 14, 1, 192000, 0x5abcd663 +0, 15, 15, 1, 192000, 0x5b09b38d +0, 16, 16, 1, 192000, 0x894d1f43 +0, 17, 17, 1, 192000, 0xbc95caaf +0, 18, 18, 1, 192000, 0xeaca27fc +0, 19, 19, 1, 192000, 0x49c5ccb4 +0, 20, 20, 1, 192000, 0x8b3e78b0 +0, 21, 21, 1, 192000, 0x1645d3ae +0, 22, 22, 1, 192000, 0x4407da0f +0, 23, 23, 1, 192000, 0x7d0826ac +0, 24, 24, 1, 192000, 0xc17ec1b8 +0, 25, 25, 1, 192000, 0x4a82520d +0, 26, 26, 1, 192000, 0xa89f0e2f +0, 27, 27, 1, 192000, 0xd58b537a +0, 28, 28, 1, 192000, 0x7123dafe +0, 29, 29, 1, 192000, 0x15d1d065 +0, 30, 30, 1, 192000, 0xa86873f6 +0, 31, 31, 1, 192000, 0x32704a91 +0, 32, 32, 1, 192000, 0xbf2b63d7 +0, 33, 33, 1, 192000, 0xb98e0126 +0, 34, 34, 1, 192000, 0x412a03ee +0, 35, 35, 1, 192000, 0x601ad161 +0, 36, 36, 1, 192000, 0x01ead407 +0, 37, 37, 1, 192000, 0x75a7bbe5 +0, 38, 38, 1, 192000, 0x155ea759 +0, 39, 39, 1, 192000, 0xe3a0a6aa +0, 40, 40, 1, 192000, 0x2b5a5770 +0, 41, 41, 1, 192000, 0x00000000 |