diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 22:58:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 23:04:49 +0200 |
| commit | 7c26761b8121ed362870b2e0eb06b85431bdd7a2 (patch) | |
| tree | 5e8bc55238ce090b34e5e8cd7777fc4dd5e7fb76 /tests/fate/filter.mak | |
| parent | 72dabdfc58064fcb249f26fc7afca2221f18a832 (diff) | |
| parent | fe1c1198e670242f3cf9e3e1eef27cff77f3ee23 (diff) | |
| download | ffmpeg-7c26761b8121ed362870b2e0eb06b85431bdd7a2.tar.gz | |
Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'
* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23':
lavf: use dts difference instead of AVPacket.duration in find_stream_info()
avf: introduce nobuffer option
fate: make yadif tests consistent across systems
vf_hqdn3d: support 9 and 10bit colordepth
vf_hqdn3d: reduce intermediate precision
vf_hqdn3d: simplify and optimize
factor identical ff_inplace_start_frame out of two filters
vf_hqdn3d: cosmetics
avprobe/avconv: fix tentative declaration compile errors on MSVS.
Conflicts:
doc/APIchanges
ffmpeg.c
ffprobe.c
libavformat/avformat.h
libavformat/options_table.h
libavformat/utils.c
libavformat/version.h
tests/fate/filter.mak
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/filter.mak')
| -rw-r--r-- | tests/fate/filter.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 5e4c1537b8..c3e368cc24 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -35,10 +35,10 @@ FATE_FILTER += fate-filter-delogo FATE_SAMPLES_AVCONV += fate-filter-delogo FATE_YADIF += fate-filter-yadif-mode0 -fate-filter-yadif-mode0: CMD = framecrc -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0 +fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0 FATE_YADIF += fate-filter-yadif-mode1 -fate-filter-yadif-mode1: CMD = framecrc -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1 +fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1 FATE_FILTER += $(FATE_YADIF) FATE_SAMPLES_AVCONV += $(FATE_YADIF) |