diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
| commit | d0bf3bf1ffaf810d8e0737847666a9b86ea5929f (patch) | |
| tree | bc4e81051e590e5d33b401b6488ce381a37c6151 /tests | |
| parent | 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb (diff) | |
| parent | bdefe22b8e8c5c1cbcb20595b8eedc052aa8e6e9 (diff) | |
| download | ffmpeg-d0bf3bf1ffaf810d8e0737847666a9b86ea5929f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
lavf: Initialize the stream info timestamps in avformat_new_stream
id3v2: Match PIC mimetype/format case-insensitively
configure: Rename check_asm() to more fitting check_inline_asm()
fate: Only test enabled filters
avresample: De-doxygenize some comments where Doxygen is not appropriate
rtmp: split chunk_size var into in_chunk_size and out_chunk_size
rtmp: Factorize the code by adding find_tracked_method
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 0d15ddbfbf..0b3e9434c3 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -18,9 +18,9 @@ $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav $(FATE_AMIX): CMP = oneoff $(FATE_AMIX): CMP_UNIT = f32 -FATE_FILTER += $(FATE_AMIX) +FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX) -FATE_FILTER += fate-filter-asyncts +FATE_FILTER-$(CONFIG_ASYNCTS_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 @@ -28,7 +28,7 @@ fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm 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_FILTER-$(CONFIG_DELOGO_FILTER) += 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 @@ -36,7 +36,7 @@ fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLE 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_FILTER-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF) -FATE_SAMPLES_AVCONV += $(FATE_FILTER) -fate-filter: $(FATE_FILTER) +FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes) +fate-filter: $(FATE_FILTER-yes) |