[vlc-devel] commit: avcodec: add fourcc's for some of the avcodec supported subtitles ( Derk-Jan Hartman )

git version control git at videolan.org
Thu Sep 18 16:32:56 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Thu Sep 18 16:21:01 2008 +0200| [12c7ab4888373fa667de1ff9d53f418c07e561c6] | committer: Derk-Jan Hartman 

avcodec: add fourcc's for some of the avcodec supported subtitles

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12c7ab4888373fa667de1ff9d53f418c07e561c6
---

 modules/codec/avcodec/fourcc.h |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/modules/codec/avcodec/fourcc.h b/modules/codec/avcodec/fourcc.h
index 3dc9341..0fb2dd6 100644
--- a/modules/codec/avcodec/fourcc.h
+++ b/modules/codec/avcodec/fourcc.h
@@ -1032,6 +1032,23 @@ static const struct
     { VLC_FOURCC('d','a','u','d'), CODEC_ID_PCM_S24DAUD,
       AUDIO_ES, "PCM ULAW" },
 
+    /* Subtitle streams */
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+0)
+    /* Before this version, subs were too experimental */
+    { VLC_FOURCC('s','p','u',' '), CODEC_ID_DVD_SUBTITLE,
+      SPU_ES, "DVD Subtitles" },
+    { VLC_FOURCC('d','v','b','s'), CODEC_ID_DVB_SUBTITLE,
+      SPU_ES, "DVB Subtitles" },
+    { VLC_FOURCC('s','u','b','t'), CODEC_ID_TEXT,
+      SPU_ES, "Plain text subtitles" },
+    { VLC_FOURCC('x','s','u','b'), CODEC_ID_XSUB,
+      SPU_ES, "DivX XSUB subtitles" },
+#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0)
+    { VLC_FOURCC('s','s','a',' '), CODEC_ID_SSA,
+      SPU_ES, "SubStation Alpha subtitles" },
+#endif
+
     { 0, 0, 0, 0 }
 };
 




More information about the vlc-devel mailing list