vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Sun Aug 10 02:17:28 2014 +0200| [42f39fd8064604a88e03137698fac16eed3b5003] | committer: Jean-Baptiste Kempf
PS: reorder by ID > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42f39fd8064604a88e03137698fac16eed3b5003 --- modules/demux/ps.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/demux/ps.h b/modules/demux/ps.h index 7053afe..1377428 100644 --- a/modules/demux/ps.h +++ b/modules/demux/ps.h @@ -96,32 +96,32 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_A52 ); tk->i_skip = 4; } - else if( (i_id&0xf0) == 0xb0 ) /* 0xb0 -> 0xbf */ + else if( ( i_id&0xfc ) == 0x00 ) /* 0x00 -> 0x03 */ { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_TRUEHD ); - tk->i_skip = 5; + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_CVD ); } - else if( ( i_id&0xe0 ) == 0x20 ) /* 0x20 -> 0x3f */ + else if( ( i_id&0xff ) == 0x10 ) /* 0x10 */ { - es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_SPU ); - tk->i_skip = 1; + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_TELETEXT ); } - else if( ( i_id&0xf0 ) == 0xa0 ) /* 0xa0 -> 0xaf */ + else if( ( i_id&0xe0 ) == 0x20 ) /* 0x20 -> 0x3f */ { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM ); + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_SPU ); tk->i_skip = 1; } else if( ( i_id&0xff ) == 0x70 ) /* 0x70 */ { es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_OGT ); } - else if( ( i_id&0xfc ) == 0x00 ) /* 0x00 -> 0x03 */ + else if( ( i_id&0xf0 ) == 0xa0 ) /* 0xa0 -> 0xaf */ { - es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_CVD ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM ); + tk->i_skip = 1; } - else if( ( i_id&0xff ) == 0x10 ) /* 0x10 */ + else if( ( i_id&0xf0 ) == 0xb0 ) /* 0xb0 -> 0xbf */ { - es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_TELETEXT ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_TRUEHD ); + tk->i_skip = 5; } else { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
