mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-24 03:39:45 +00:00
fate: fix SAMPLES dependency for ffprobe.
FATE_SAMPLES_FFPROBE is a different list than FATE_FFPROBE, the same way FATE_SAMPLES_FFMPEG is a different list than FATE_FFMPEG; these FATE_SAMPLES_<tool> lists are in the FATE_EXTERN list, which is only used when SAMPLES is set.
This commit is contained in:
parent
0de41ead6f
commit
7be9c0c10f
@ -122,7 +122,7 @@ FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
|
||||
FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
|
||||
|
||||
FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes)
|
||||
FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
|
||||
FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE)
|
||||
FATE_EXTERN += $(FATE_EXTERN-yes)
|
||||
|
||||
FATE += $(FATE-yes)
|
||||
@ -130,7 +130,7 @@ FATE += $(FATE_LIBAVUTIL)
|
||||
|
||||
$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)
|
||||
|
||||
$(FATE_FFPROBE): ffprobe$(EXESUF)
|
||||
$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF)
|
||||
|
||||
ifdef SAMPLES
|
||||
FATE += $(FATE_FULL) $(FATE_FULL-yes)
|
||||
|
@ -59,6 +59,6 @@ FATE_METADATA_FILTER-$(call ALLYES, FFPROBE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXE
|
||||
fate-filter-metadata-silencedetect: SRC = $(SAMPLES)/amrwb/seed-12k65.awb
|
||||
fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie=$(SRC),silencedetect=d=.1"
|
||||
|
||||
FATE_FFPROBE += $(FATE_METADATA_FILTER-yes)
|
||||
FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes)
|
||||
|
||||
fate-filter: $(FATE_FILTER-yes) $(FATE_METADATA_FILTER-yes)
|
||||
|
Loading…
Reference in New Issue
Block a user