diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:22:37 +0200 |
| commit | 7ae473e8a04f686bbeda75c40167c2df4211e662 (patch) | |
| tree | 073415316c09d2c86fcd41640f0bab7fddc8c4ed /tests | |
| parent | a80ce390df38b30f70012c9ce059129516664805 (diff) | |
| parent | cf22705e87b6f5015b5cbbf60b6ce9b818eb1900 (diff) | |
| download | ffmpeg-7ae473e8a04f686bbeda75c40167c2df4211e662.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter.mak | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 73b317b347..0d15ddbfbf 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -19,21 +19,16 @@ $(FATE_AMIX): CMP = oneoff $(FATE_AMIX): CMP_UNIT = f32 FATE_FILTER += $(FATE_AMIX) -FATE_SAMPLES_AVCONV += $(FATE_AMIX) -FATE_ASYNCTS += fate-filter-asyncts +FATE_FILTER += fate-filter-asyncts fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv fate-filter-asyncts: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1 fate-filter-asyncts: CMP = oneoff fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm -FATE_FILTER += $(FATE_ASYNCTS) -FATE_SAMPLES_AVCONV += $(FATE_ASYNCTS) - fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an FATE_FILTER += fate-filter-delogo -FATE_SAMPLES_AVCONV += fate-filter-delogo FATE_YADIF += fate-filter-yadif-mode0 fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0 @@ -42,6 +37,6 @@ FATE_YADIF += fate-filter-yadif-mode1 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) +FATE_SAMPLES_AVCONV += $(FATE_FILTER) fate-filter: $(FATE_FILTER) |