summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-03-10 11:51:02 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-03-10 13:45:15 +0100
commitf9b34b8bf967e8e80df9bcb4a16556a9d4526484 (patch)
treee2d11f970af4565a30b43a4e6303fc426bf35b94 /tests
parentf185a040b0d5f6766c8016cc84b415d414d38246 (diff)
ffmpeg: port sub2video to AVFrame.
And re-enable the FATE test.
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/ffmpeg.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index a39b0135a2..cc0e22add3 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -22,7 +22,7 @@ fate-force_key_frames: CMD = enc_dec \
avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
framecrc "" "" "-skip_frame nokey"
-#FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video
+FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video
fate-sub2video: tests/data/vsynth2.yuv
fate-sub2video: CMD = framecrc \
-f rawvideo -r 5 -s 352x288 -pix_fmt yuv420p -i tests/data/vsynth2.yuv \