[vlc-commits] PS: add rarer type-id
Jean-Baptiste Kempf
git at videolan.org
Mon Jul 21 01:07:55 CEST 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 20 23:01:24 2014 +0200| [50e5e71eb91458e54034ef539fba57aadaf874bd] | committer: Jean-Baptiste Kempf
PS: add rarer type-id
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=50e5e71eb91458e54034ef539fba57aadaf874bd
---
modules/demux/ps.h | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index c36bdcd..962a606 100644
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -174,10 +174,16 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
{
es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MP4V );
}
- else if( (i_id&0xf0) == 0xe0 && i_type == 0x02 )
+ else if( (i_id&0xf0) == 0xe0 && i_type == 0x01 ||
+ (i_id&0xf0) == 0xe0 && i_type == 0x02 )
{
es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV );
}
+ else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x03 ||
+ ( i_id&0xe0 ) == 0xc0 && i_type == 0x04 )
+ {
+ es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA );
+ }
else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x0f )
{
es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A );
@@ -186,10 +192,6 @@ 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_MP4A );
}
- else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x03 )
- {
- es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA );
- }
if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xf0 ) == 0xe0 )
{
More information about the vlc-commits
mailing list