diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 01:56:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 02:16:26 +0200 |
commit | 706bd8ea19a6f723795547885714033ac68a4d74 (patch) | |
tree | 39f7933c9432b35801c81903fa7dc352de92fe95 /tests/ref/fate/filter-delogo | |
parent | 0f8f9248471bbee5649c8efdc52d02c1cf93bba1 (diff) | |
parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) | |
download | ffmpeg-706bd8ea19a6f723795547885714033ac68a4d74.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
h264_idct_10bit: port x86 assembly to cpuflags.
x86inc: clip num_args to 7 on x86-32.
x86inc: sync to latest version from x264.
fft: rename "z" to "zc" to prevent name collision.
wv: return meaningful error codes.
wv: return AVERROR_EOF on EOF, not EIO.
mp3dec: forward errors for av_get_packet().
mp3dec: remove a pointless local variable.
mp3dec: remove commented out cruft.
lavfi: bump minor to mark stabilizing the ABI.
FATE: add tests for yadif.
FATE: add a test for delogo video filter.
FATE: add a test for amix audio filter.
audiogen: allow specifying random seed as a commandline parameter.
vc1dec: Override invalid macroblock quantizer
vc1: avoid reading beyond the last line in vc1_draw_sprites()
vc1dec: check that coded slice positions and interlacing match.
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
configure: Move parts that should not be user-selectable to CONFIG_EXTRA
lavf: remove commented out cruft in avformat_find_stream_info()
...
Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/filter-delogo')
-rw-r--r-- | tests/ref/fate/filter-delogo | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/tests/ref/fate/filter-delogo b/tests/ref/fate/filter-delogo new file mode 100644 index 0000000000..e0f24cd8ce --- /dev/null +++ b/tests/ref/fate/filter-delogo @@ -0,0 +1,110 @@ +#tb 0: 32768/982057 +0, 0, 0, 1, 126720, 0x689de87e +0, 1, 1, 1, 126720, 0x3db9e91c +0, 2, 2, 1, 126720, 0x3db9e91c +0, 3, 3, 1, 126720, 0x3db9e91c +0, 4, 4, 1, 126720, 0xfa6ae95e +0, 5, 5, 1, 126720, 0x5bcbf0e6 +0, 6, 6, 1, 126720, 0x94a0f126 +0, 7, 7, 1, 126720, 0x0250f106 +0, 8, 8, 1, 126720, 0xcf6ab4bc +0, 9, 9, 1, 126720, 0x44aeb57c +0, 10, 10, 1, 126720, 0x33b0b5bc +0, 11, 11, 1, 126720, 0xc4bab591 +0, 12, 12, 1, 126720, 0xa492b5ec +0, 13, 13, 1, 126720, 0x1459b85c +0, 14, 14, 1, 126720, 0x806fb8dc +0, 15, 15, 1, 126720, 0xd241b871 +0, 16, 16, 1, 126720, 0x698eb5cc +0, 17, 17, 1, 126720, 0x4719aa98 +0, 18, 18, 1, 126720, 0x9ca1962c +0, 19, 19, 1, 126720, 0x18cda460 +0, 20, 20, 1, 126720, 0xc230b716 +0, 21, 21, 1, 126720, 0x8451a4e2 +0, 22, 22, 1, 126720, 0x59e9a7ea +0, 23, 23, 1, 126720, 0xc77ca73d +0, 24, 24, 1, 126720, 0x725fb976 +0, 25, 25, 1, 126720, 0xb30da3b3 +0, 26, 26, 1, 126720, 0x7af2ea86 +0, 27, 27, 1, 126720, 0x40d4b4eb +0, 28, 28, 1, 126720, 0x49d00307 +0, 29, 29, 1, 126720, 0x44c8848e +0, 30, 30, 1, 126720, 0xc6990101 +0, 31, 31, 1, 126720, 0x2e01b963 +0, 32, 32, 1, 126720, 0xd0e903f0 +0, 33, 33, 1, 126720, 0x3457d592 +0, 34, 34, 1, 126720, 0x4f1ddb3c +0, 35, 35, 1, 126720, 0x3980ace5 +0, 36, 36, 1, 126720, 0xb1e37954 +0, 37, 37, 1, 126720, 0x619fc554 +0, 38, 38, 1, 126720, 0x945fb39e +0, 39, 39, 1, 126720, 0xb1d5e0ce +0, 40, 40, 1, 126720, 0xf26e1dcc +0, 41, 41, 1, 126720, 0x04d5783e +0, 42, 42, 1, 126720, 0xbaa0479e +0, 43, 43, 1, 126720, 0x20d88b01 +0, 44, 44, 1, 126720, 0x59d99901 +0, 45, 45, 1, 126720, 0x1c6e09f6 +0, 46, 46, 1, 126720, 0xeec50fc5 +0, 47, 47, 1, 126720, 0xb3a92827 +0, 48, 48, 1, 126720, 0xf62dd2b6 +0, 49, 49, 1, 126720, 0x75b1e619 +0, 50, 50, 1, 126720, 0x6bbce2c0 +0, 51, 51, 1, 126720, 0xd93e023c +0, 52, 52, 1, 126720, 0xbbe8e7c2 +0, 53, 53, 1, 126720, 0x2272ec17 +0, 54, 54, 1, 126720, 0xf5e4ee6e +0, 55, 55, 1, 126720, 0x751d2607 +0, 56, 56, 1, 126720, 0x44c499c9 +0, 57, 57, 1, 126720, 0xddccd842 +0, 58, 58, 1, 126720, 0x508dd214 +0, 59, 59, 1, 126720, 0x8eb10272 +0, 60, 60, 1, 126720, 0x7224b1c6 +0, 61, 61, 1, 126720, 0x50ff456c +0, 62, 62, 1, 126720, 0xa81e2731 +0, 63, 63, 1, 126720, 0x7e50456d +0, 64, 64, 1, 126720, 0x44802978 +0, 65, 65, 1, 126720, 0x86e88743 +0, 66, 66, 1, 126720, 0x0b1087d6 +0, 67, 67, 1, 126720, 0xb0227d21 +0, 68, 68, 1, 126720, 0x29d10bd2 +0, 69, 69, 1, 126720, 0x04b43afa +0, 70, 70, 1, 126720, 0xb48e9698 +0, 71, 71, 1, 126720, 0x75d760fb +0, 72, 72, 1, 126720, 0xa2ab1fdb +0, 73, 73, 1, 126720, 0xec30a5ee +0, 74, 74, 1, 126720, 0xbdab7c8c +0, 75, 75, 1, 126720, 0xac5c3f2c +0, 76, 76, 1, 126720, 0xce6350be +0, 77, 77, 1, 126720, 0xb109657a +0, 78, 78, 1, 126720, 0x723865a4 +0, 79, 79, 1, 126720, 0xa9869124 +0, 80, 80, 1, 126720, 0xc41af558 +0, 81, 81, 1, 126720, 0xcbe6a402 +0, 82, 82, 1, 126720, 0xb6735ecb +0, 83, 83, 1, 126720, 0xba3059f2 +0, 84, 84, 1, 126720, 0xe7d63b8d +0, 85, 85, 1, 126720, 0x8f115906 +0, 86, 86, 1, 126720, 0xaf6a8dcb +0, 87, 87, 1, 126720, 0xb73e846e +0, 88, 88, 1, 126720, 0xedd6380f +0, 89, 89, 1, 126720, 0xd9026acf +0, 90, 90, 1, 126720, 0xa03a650b +0, 91, 91, 1, 126720, 0x262765bc +0, 92, 92, 1, 126720, 0xaaa9ded1 +0, 93, 93, 1, 126720, 0xe4f42665 +0, 94, 94, 1, 126720, 0x78daf760 +0, 95, 95, 1, 126720, 0x3b0c6ef8 +0, 96, 96, 1, 126720, 0xb745df80 +0, 97, 97, 1, 126720, 0x08e57b90 +0, 98, 98, 1, 126720, 0x6f883ab0 +0, 99, 99, 1, 126720, 0x934b4dd5 +0, 100, 100, 1, 126720, 0x762f108f +0, 101, 101, 1, 126720, 0x91ee0f2b +0, 102, 102, 1, 126720, 0x9af6e5e8 +0, 103, 103, 1, 126720, 0xdcd95e0a +0, 104, 104, 1, 126720, 0x22c33a6e +0, 105, 105, 1, 126720, 0x21c1b7f4 +0, 106, 106, 1, 126720, 0x0a66a1ed +0, 107, 107, 1, 126720, 0x53fea81b +0, 108, 108, 1, 126720, 0x597f5567 |