diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-27 22:36:47 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 22:46:42 +0100 |
| commit | 5c68aae90883497d59a2a49cf75816cf5906e14a (patch) | |
| tree | 83ede8ebe1751d4d3af4946ff8b8a1bd27a41c54 /tests | |
| parent | 5f02844c8d4fc93972932a84f0a5cbb02fe12a00 (diff) | |
| download | ffmpeg-5c68aae90883497d59a2a49cf75816cf5906e14a.tar.gz | |
Add VPlayer subtitles demuxer and decoder.
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/subtitles.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/sub-vplayer | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 9934ddf9e7..3f7e02d4e1 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -28,6 +28,9 @@ fate-sub-subripenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -s FATE_SUBTITLES_ASS-$(call DEMDEC, SUBVIEWER, SUBVIEWER) += fate-sub-subviewer fate-sub-subviewer: CMD = md5 -i $(SAMPLES)/sub/SubViewer_capability_tester.sub -f ass +FATE_SUBTITLES_ASS-$(call DEMDEC, VPLAYER, VPLAYER) += fate-sub-vplayer +fate-sub-vplayer: CMD = md5 -i $(SAMPLES)/sub/VPlayer_capability_tester.txt -f ass + FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer new file mode 100644 index 0000000000..b8fc40e1e8 --- /dev/null +++ b/tests/ref/fate/sub-vplayer @@ -0,0 +1 @@ +c8201c542f43a9ea42a787ac74d28049 |