fourcc: add EIA608

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index d8d8324b92902a1fa4a900bf914badb0d13c3f59..d63493a70dc932f530d4a765cf50063e86927c8f 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -460,6 +460,11 @@
 /* EBU STL (TECH. 3264-E) */
 #define VLC_CODEC_EBU_STL   VLC_FOURCC('S','T','L',' ')
 #define VLC_CODEC_SCTE_27   VLC_FOURCC('S','C','2','7')
+/* EIA-608 */
+#define VLC_CODEC_EIA608_1  VLC_FOURCC('c','c','1',' ')
+#define VLC_CODEC_EIA608_2  VLC_FOURCC('c','c','2',' ')
+#define VLC_CODEC_EIA608_3  VLC_FOURCC('c','c','3',' ')
+#define VLC_CODEC_EIA608_4  VLC_FOURCC('c','c','4',' ')
 
 /* XYZ colorspace 12 bits packed in 16 bits, organisation |XXX0|YYY0|ZZZ0| */
 #define VLC_CODEC_XYZ12     VLC_FOURCC('X','Y','1','2')

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 7931e31c93e3f464cfab7cc1384ee4f8146edd96..678f9b902977ada8c942d665da9b950e9fa91e8d 100644 (file)
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -167,16 +167,16 @@ static int Open( vlc_object_t *p_this )
 
     switch( p_dec->fmt_in.i_codec )
     {
-        case VLC_FOURCC('c','c','1',' '):
+        case VLC_CODEC_EIA608_1:
             i_field = 0; i_channel = 1;
             break;
-        case VLC_FOURCC('c','c','2',' '):
+        case VLC_CODEC_EIA608_2:
             i_field = 0; i_channel = 2;
             break;
-        case VLC_FOURCC('c','c','3',' '):
+        case VLC_CODEC_EIA608_3:
             i_field = 1; i_channel = 1;
             break;
-        case VLC_FOURCC('c','c','4',' '):
+        case VLC_CODEC_EIA608_4:
             i_field = 1; i_channel = 2;
             break;
 

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 10f3d66b9ac5551f66b07b0fcc2d1362b90a89fd..accc2cf722982c6541ee5c2fd90b89464cf684df 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1574,6 +1574,12 @@ static const staticentry_t p_list_spu[] = {
     B(VLC_CODEC_SCTE_27, "SCTE-27 subtitles"),
         A("SC27"),
 
+    B(VLC_CODEC_EIA608_1, "EIA-608 subtitles"),
+        A("cc1 "),
+        A("cc2 "),
+        A("cc3 "),
+        A("cc4 "),
+
     B(0, "")
 };