Commit 7074dbe1 authored by Laurent Aimar's avatar Laurent Aimar

Used VLC_CODEC_OGT/CVD in ps demuxer.

parent 08737f85
......@@ -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;
}
......
......@@ -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 )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment