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
This commit is contained in:
nicodvb 2007-07-08 10:06:47 +00:00
parent e0374f90a8
commit 30f3c76528
1 changed files with 3 additions and 6 deletions

View File

@ -362,10 +362,7 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){
len-=10;hdrlen-=10; len-=10;hdrlen-=10;
} }
len-=hdrlen; len-=hdrlen;
if(hdrlen>0) { if(parse_ext2 && hdrlen>=3) {
if(!parse_ext2)
stream_skip(demux->stream,hdrlen); // skip header bytes
else if(hdrlen>=3) {
c=stream_read_char(demux->stream); c=stream_read_char(demux->stream);
hdrlen--; hdrlen--;
@ -414,9 +411,9 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){
hdrlen--; hdrlen--;
if(c<0x55 || c>0x5F) { mp_msg(MSGT_DEMUX,MSGL_V,"demux_mpg: unknown vc1 substream_id: 0x%x \n", c); return -1;} 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; 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) { if(id==0x1FD && pes_ext2_subid!=-1) {
//==== EVO VC1 STREAMS ===// //==== EVO VC1 STREAMS ===//