From 30f3c765287c6520d478f80aa788628772845552 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 8 Jul 2007 10:06:47 +0000 Subject: unified the skip of header and stuffing bytes after the parsing of pes_extension[12] fields git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23742 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mpg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 092bbefb5b..bf3c55d77f 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -362,10 +362,7 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ len-=10;hdrlen-=10; } len-=hdrlen; - if(hdrlen>0) { - if(!parse_ext2) - stream_skip(demux->stream,hdrlen); // skip header bytes - else if(hdrlen>=3) { + if(parse_ext2 && hdrlen>=3) { c=stream_read_char(demux->stream); hdrlen--; @@ -414,9 +411,9 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ hdrlen--; if(c<0x55 || c>0x5F) { mp_msg(MSGT_DEMUX,MSGL_V,"demux_mpg: unknown vc1 substream_id: 0x%x \n", c); return -1;} pes_ext2_subid=c; - if(hdrlen>0) stream_skip(demux->stream, hdrlen); } - } + if(hdrlen>0) + stream_skip(demux->stream,hdrlen); // skip header and stuffing bytes if(id==0x1FD && pes_ext2_subid!=-1) { //==== EVO VC1 STREAMS ===// -- cgit v1.2.3