mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
Redundant packet ignoring is RV30-only (at least frame-header flag 0x20 is)
noticed by Balatoni Denes <pnis@coder.hu> [sample files: pro: DISK1.RM contra: spygames-2MB.rmvb] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9554 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
264fd4dc0e
commit
31d2363926
@ -593,7 +593,7 @@ got_video:
|
||||
if(dp_hdr->len!=vpkg_length-vpkg_offset)
|
||||
mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
|
||||
stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset);
|
||||
if(dp_data[dp_hdr->len]&0x20) --dp_hdr->chunks; else
|
||||
if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
|
||||
dp_hdr->len+=vpkg_offset;
|
||||
len-=vpkg_offset;
|
||||
mp_dbg(MSGT_DEMUX,MSGL_DBG2, "fragment (%d bytes) appended, %d bytes left\n",vpkg_offset,len);
|
||||
@ -609,7 +609,7 @@ got_video:
|
||||
if(dp_hdr->len!=vpkg_offset)
|
||||
mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d offset=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,len,vpkg_length);
|
||||
stream_read(demuxer->stream, dp_data+dp_hdr->len, len);
|
||||
if(dp_data[dp_hdr->len]&0x20) --dp_hdr->chunks; else
|
||||
if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
|
||||
dp_hdr->len+=len;
|
||||
len=0;
|
||||
break; // no more fragments in this chunk!
|
||||
|
Loading…
Reference in New Issue
Block a user