From: Laurent Aimar <fenrir@videolan.org>
Date: Wed, 26 May 2010 21:31:50 +0000 (+0200)
Subject: Used VLC_CODEC_OGT/CVD in ps demuxer.
X-Git-Tag: 1.2.0-pre1~6460
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=7074dbe12d4cfa36e47623b9ef2fe5b78e56977b;p=vlc

Used VLC_CODEC_OGT/CVD in ps demuxer.
---

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index ffab1e7e0c..7bdb388f86 100644
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -391,8 +391,8 @@ static int Demux( demux_t *p_demux )
             /* The popular VCD/SVCD subtitling WinSubMux does not
              * renumber the SCRs when merging subtitles into the PES */
             if( tk->b_seen &&
-                ( tk->fmt.i_codec == VLC_FOURCC('o','g','t',' ') ||
-                  tk->fmt.i_codec == VLC_FOURCC('c','v','d',' ') ) )
+                ( tk->fmt.i_codec == VLC_CODEC_OGT ||
+                  tk->fmt.i_codec == VLC_CODEC_CVD ) )
             {
                 p_sys->i_scr = -1;
             }
diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index ae778d6914..c432faa3eb 100644
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -112,11 +112,11 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
         }
         else if( ( i_id&0xff ) == 0x70 )
         {
-            es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('o','g','t',' ') );
+            es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_OGT );
         }
         else if( ( i_id&0xfc ) == 0x00 )
         {
-            es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('c','v','d',' ') );
+            es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_CVD );
         }
         else if( ( i_id&0xff ) == 0x10 )
         {