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/dfa8 | |
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/dfa8')
-rw-r--r-- | tests/ref/fate/dfa8 | 73 |
1 files changed, 37 insertions, 36 deletions
diff --git a/tests/ref/fate/dfa8 b/tests/ref/fate/dfa8 index c58a07633e..866260a10c 100644 --- a/tests/ref/fate/dfa8 +++ b/tests/ref/fate/dfa8 @@ -1,36 +1,37 @@ -0, 0, 134724, 0x53784ca9 -0, 6390, 134724, 0x14c345b7 -0, 12780, 134724, 0xe0d0dd51 -0, 19170, 134724, 0xd53b5610 -0, 25560, 134724, 0x7cbb8d47 -0, 31950, 134724, 0x875d67c4 -0, 38340, 134724, 0x9811c085 -0, 44730, 134724, 0x25f6d228 -0, 51120, 134724, 0x349495a0 -0, 57510, 134724, 0xd0d75311 -0, 63900, 134724, 0xb49cdfbb -0, 70290, 134724, 0x9fa69518 -0, 76680, 134724, 0x28a1f58c -0, 83070, 134724, 0xb8dab657 -0, 89460, 134724, 0x8c7e3b3b -0, 95850, 134724, 0x37268acf -0, 102240, 134724, 0xcce8ca02 -0, 108630, 134724, 0xe0fd0c28 -0, 115020, 134724, 0x5bdac906 -0, 121410, 134724, 0xdd850bf0 -0, 127800, 134724, 0x2002a228 -0, 134190, 134724, 0x633617ea -0, 140580, 134724, 0x2a3ef337 -0, 146970, 134724, 0x507886c3 -0, 153360, 134724, 0x51c0f07b -0, 159750, 134724, 0x5e73dce1 -0, 166140, 134724, 0x26acc6f0 -0, 172530, 134724, 0x360c4349 -0, 178920, 134724, 0xc7dbabd4 -0, 185310, 134724, 0x671bbf66 -0, 191700, 134724, 0x4d44df79 -0, 198090, 134724, 0x69eade5b -0, 204480, 134724, 0x2b1bca82 -0, 210870, 134724, 0x8b16af47 -0, 217260, 134724, 0xb59fa1bd -0, 223650, 134724, 0x2ec17c24 +#tb 0: 71/1000 +0, 0, 0, 1, 134724, 0x53784ca9 +0, 1, 1, 1, 134724, 0x14c345b7 +0, 2, 2, 1, 134724, 0xe0d0dd51 +0, 3, 3, 1, 134724, 0xd53b5610 +0, 4, 4, 1, 134724, 0x7cbb8d47 +0, 5, 5, 1, 134724, 0x875d67c4 +0, 6, 6, 1, 134724, 0x9811c085 +0, 7, 7, 1, 134724, 0x25f6d228 +0, 8, 8, 1, 134724, 0x349495a0 +0, 9, 9, 1, 134724, 0xd0d75311 +0, 10, 10, 1, 134724, 0xb49cdfbb +0, 11, 11, 1, 134724, 0x9fa69518 +0, 12, 12, 1, 134724, 0x28a1f58c +0, 13, 13, 1, 134724, 0xb8dab657 +0, 14, 14, 1, 134724, 0x8c7e3b3b +0, 15, 15, 1, 134724, 0x37268acf +0, 16, 16, 1, 134724, 0xcce8ca02 +0, 17, 17, 1, 134724, 0xe0fd0c28 +0, 18, 18, 1, 134724, 0x5bdac906 +0, 19, 19, 1, 134724, 0xdd850bf0 +0, 20, 20, 1, 134724, 0x2002a228 +0, 21, 21, 1, 134724, 0x633617ea +0, 22, 22, 1, 134724, 0x2a3ef337 +0, 23, 23, 1, 134724, 0x507886c3 +0, 24, 24, 1, 134724, 0x51c0f07b +0, 25, 25, 1, 134724, 0x5e73dce1 +0, 26, 26, 1, 134724, 0x26acc6f0 +0, 27, 27, 1, 134724, 0x360c4349 +0, 28, 28, 1, 134724, 0xc7dbabd4 +0, 29, 29, 1, 134724, 0x671bbf66 +0, 30, 30, 1, 134724, 0x4d44df79 +0, 31, 31, 1, 134724, 0x69eade5b +0, 32, 32, 1, 134724, 0x2b1bca82 +0, 33, 33, 1, 134724, 0x8b16af47 +0, 34, 34, 1, 134724, 0xb59fa1bd +0, 35, 35, 1, 134724, 0x2ec17c24 |