aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-02-28 00:45:51 +0100
committerClément Bœsch <ubitux@gmail.com>2013-02-28 01:23:24 +0100
commit7b2d50f81ec5b04e6cb86e8b579fac9a34029951 (patch)
treeaf5a17e3b4e3f41139f609b2e7db1c6043013f0b /tests
parent4a8fc1d83b1b55e1ac533644168018ebeec0c732 (diff)
downloadffmpeg-7b2d50f81ec5b04e6cb86e8b579fac9a34029951.tar.gz
build: make iconv build configurable.
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/subtitles.mak3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
index e0681e5bfc..8e586fbe8a 100644
--- a/tests/fate/subtitles.mak
+++ b/tests/fate/subtitles.mak
@@ -52,8 +52,7 @@ fate-sub-vplayer: CMD = md5 -i $(SAMPLES)/sub/VPlayer_capability_tester.txt -f a
FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt
fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass
-FATE_SUBTITLES_CHARENC-$(HAVE_ICONV) = fate-sub-charenc
-FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += $(FATE_SUBTITLES_CHARENC-yes)
+FATE_SUBTITLES_ASS-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_DECODER ICONV) += fate-sub-charenc
fate-sub-charenc: CMD = md5 -sub_charenc cp1251 -i $(SAMPLES)/sub/cp1251-subtitles.sub -f ass
FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)