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-yadif-mode0 | |
| 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-yadif-mode0')
| -rw-r--r-- | tests/ref/fate/filter-yadif-mode0 | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/tests/ref/fate/filter-yadif-mode0 b/tests/ref/fate/filter-yadif-mode0 new file mode 100644 index 0000000000..a25ea3e8c8 --- /dev/null +++ b/tests/ref/fate/filter-yadif-mode0 @@ -0,0 +1,32 @@ +#tb 0: 1/25 +0, 9, 9, 1, 622080, 0x1511cae9 +0, 10, 10, 1, 622080, 0x6e77e746 +0, 11, 11, 1, 622080, 0x89aac777 +0, 12, 12, 1, 622080, 0x7e0a9335 +0, 13, 13, 1, 622080, 0x5f34759b +0, 14, 14, 1, 622080, 0xfac498a6 +0, 15, 15, 1, 622080, 0xe60e7a9e +0, 16, 16, 1, 622080, 0x44875bbd +0, 17, 17, 1, 622080, 0xfa761aab +0, 18, 18, 1, 622080, 0x59be119c +0, 19, 19, 1, 622080, 0x21316b36 +0, 20, 20, 1, 622080, 0x929fde5b +0, 21, 21, 1, 622080, 0xfca8990c +0, 22, 22, 1, 622080, 0x1ec87d02 +0, 23, 23, 1, 622080, 0x5768eea0 +0, 24, 24, 1, 622080, 0x1a0894ab +0, 25, 25, 1, 622080, 0xb4e61323 +0, 26, 26, 1, 622080, 0xb773341a +0, 27, 27, 1, 622080, 0x8a914cf7 +0, 28, 28, 1, 622080, 0xf1cfbc7d +0, 29, 29, 1, 622080, 0xebaeb317 +0, 30, 30, 1, 622080, 0xbae9adf4 +0, 31, 31, 1, 622080, 0x593544fd +0, 32, 32, 1, 622080, 0x2cd8ec0b +0, 33, 33, 1, 622080, 0x8032d9d4 +0, 34, 34, 1, 622080, 0x5c67ace7 +0, 35, 35, 1, 622080, 0x95714528 +0, 36, 36, 1, 622080, 0xa11cbed2 +0, 37, 37, 1, 622080, 0x7389f8f1 +0, 38, 38, 1, 622080, 0xa694f3f2 +0, 39, 39, 1, 622080, 0xac3a3d09 |