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/h264-conformance-frext-alphaconformanceg | |
| 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/h264-conformance-frext-alphaconformanceg')
| -rw-r--r-- | tests/ref/fate/h264-conformance-frext-alphaconformanceg | 87 |
1 files changed, 44 insertions, 43 deletions
diff --git a/tests/ref/fate/h264-conformance-frext-alphaconformanceg b/tests/ref/fate/h264-conformance-frext-alphaconformanceg index 02a7274292..dee1c424ff 100644 --- a/tests/ref/fate/h264-conformance-frext-alphaconformanceg +++ b/tests/ref/fate/h264-conformance-frext-alphaconformanceg @@ -1,43 +1,44 @@ -0, 0, 783360, 0xbc458a9a -0, 3600, 783360, 0xc2b4a765 -0, 7200, 783360, 0x40a8ca87 -0, 10800, 783360, 0xdd0cbc2c -0, 14400, 783360, 0xecf8e434 -0, 18000, 783360, 0xcc87e3d4 -0, 21600, 783360, 0x386e1a34 -0, 25200, 783360, 0x6ac4a62e -0, 28800, 783360, 0xf23d89bb -0, 32400, 783360, 0x52f7b94c -0, 36000, 783360, 0x2b4ea2c2 -0, 39600, 783360, 0x0a43839c -0, 43200, 783360, 0xad4b81ea -0, 46800, 783360, 0xcb4fe0d4 -0, 50400, 783360, 0x6c3ca755 -0, 54000, 783360, 0x17d37f49 -0, 57600, 783360, 0x8fdfebec -0, 61200, 783360, 0x1a177b49 -0, 64800, 783360, 0x72d230ad -0, 68400, 783360, 0x62147d69 -0, 72000, 783360, 0xeed9b62c -0, 75600, 783360, 0x7fc45b23 -0, 79200, 783360, 0x5dc60681 -0, 82800, 783360, 0x2d91c001 -0, 86400, 783360, 0x259ab608 -0, 90000, 783360, 0x29112b29 -0, 93600, 783360, 0x7e4d497e -0, 97200, 783360, 0x616e5507 -0, 100800, 783360, 0x299473c9 -0, 104400, 783360, 0x4d63d722 -0, 108000, 783360, 0xa89e4bc6 -0, 111600, 783360, 0xbdef585a -0, 115200, 783360, 0x5b12c72c -0, 118800, 783360, 0x5a884bd8 -0, 122400, 783360, 0x97728ade -0, 126000, 783360, 0x27dd8999 -0, 129600, 783360, 0x94104d66 -0, 133200, 783360, 0xf30244f1 -0, 136800, 783360, 0xfc98c63e -0, 140400, 783360, 0x8b27de2e -0, 144000, 783360, 0xfc6bbbf2 -0, 147600, 783360, 0x4527b6a3 -0, 151200, 783360, 0x4070daf0 +#tb 0: 1/25 +0, 0, 0, 1, 783360, 0xbc458a9a +0, 1, 1, 1, 783360, 0xc2b4a765 +0, 2, 2, 1, 783360, 0x40a8ca87 +0, 3, 3, 1, 783360, 0xdd0cbc2c +0, 4, 4, 1, 783360, 0xecf8e434 +0, 5, 5, 1, 783360, 0xcc87e3d4 +0, 6, 6, 1, 783360, 0x386e1a34 +0, 7, 7, 1, 783360, 0x6ac4a62e +0, 8, 8, 1, 783360, 0xf23d89bb +0, 9, 9, 1, 783360, 0x52f7b94c +0, 10, 10, 1, 783360, 0x2b4ea2c2 +0, 11, 11, 1, 783360, 0x0a43839c +0, 12, 12, 1, 783360, 0xad4b81ea +0, 13, 13, 1, 783360, 0xcb4fe0d4 +0, 14, 14, 1, 783360, 0x6c3ca755 +0, 15, 15, 1, 783360, 0x17d37f49 +0, 16, 16, 1, 783360, 0x8fdfebec +0, 17, 17, 1, 783360, 0x1a177b49 +0, 18, 18, 1, 783360, 0x72d230ad +0, 19, 19, 1, 783360, 0x62147d69 +0, 20, 20, 1, 783360, 0xeed9b62c +0, 21, 21, 1, 783360, 0x7fc45b23 +0, 22, 22, 1, 783360, 0x5dc60681 +0, 23, 23, 1, 783360, 0x2d91c001 +0, 24, 24, 1, 783360, 0x259ab608 +0, 25, 25, 1, 783360, 0x29112b29 +0, 26, 26, 1, 783360, 0x7e4d497e +0, 27, 27, 1, 783360, 0x616e5507 +0, 28, 28, 1, 783360, 0x299473c9 +0, 29, 29, 1, 783360, 0x4d63d722 +0, 30, 30, 1, 783360, 0xa89e4bc6 +0, 31, 31, 1, 783360, 0xbdef585a +0, 32, 32, 1, 783360, 0x5b12c72c +0, 33, 33, 1, 783360, 0x5a884bd8 +0, 34, 34, 1, 783360, 0x97728ade +0, 35, 35, 1, 783360, 0x27dd8999 +0, 36, 36, 1, 783360, 0x94104d66 +0, 37, 37, 1, 783360, 0xf30244f1 +0, 38, 38, 1, 783360, 0xfc98c63e +0, 39, 39, 1, 783360, 0x8b27de2e +0, 40, 40, 1, 783360, 0xfc6bbbf2 +0, 41, 41, 1, 783360, 0x4527b6a3 +0, 42, 42, 1, 783360, 0x4070daf0 |