diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
| commit | 04c6ecb7da677049cd52efe2a980e586167e9e5d (patch) | |
| tree | 1a8279cffbc9424ade212f660d0c99314230011a /tests/fate/subtitles.mak | |
| parent | cdea54b4c8cd891aa12f85c41b0cd4bd81be83f9 (diff) | |
| parent | c9ef43215c7d68c2cdcdbe02287aa114f27a32ed (diff) | |
| download | ffmpeg-04c6ecb7da677049cd52efe2a980e586167e9e5d.tar.gz | |
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
fate-vc1: add dependencies
ARM: fix overreads in neon h264 chroma mc
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
gitignore: ignore files created by msvc
fate: Add proper dependencies for the tests in video.mak
configure: Disable Snow decoder and encoder by default
lzo: Drop obsolete fast_memcpy reference
build: Drop OBJS declaration for non-existing PCM_DVD encoder
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/subtitles.mak')
| -rw-r--r-- | tests/fate/subtitles.mak | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index d73352ce10..d939da9bf8 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -16,7 +16,7 @@ fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f FATE_SUBTITLES += fate-sub-sami fate-sub-sami: CMD = md5 -i $(SAMPLES)/sub/SAMI_capability_tester.smi -f ass -FATE_SUBTITLES += fate-sub-srt +FATE_SUBTITLES-$(call DEMDEC, SRT, SRT) += fate-sub-srt fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass FATE_SUBTITLES += fate-sub-subripenc @@ -28,5 +28,7 @@ fate-sub-subviewer: CMD = md5 -i $(SAMPLES)/sub/SubViewer_capability_tester.sub FATE_SUBTITLES += fate-sub-webvtt fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass +FATE_SUBTITLES += $(FATE_SUBTITLES-yes) + FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES) fate-subtitles: $(FATE_SUBTITLES) |