diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
| commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
| tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /tests/Makefile | |
| parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
| parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) | |
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index 8e22fbfba4..6fb2eddaf6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -118,9 +118,6 @@ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) -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_SAMPLES_FFPROBE) FATE_EXTERN += $(FATE_EXTERN-yes) |