mirror of
https://github.com/mpv-player/mpv
synced 2025-03-01 03:40:43 +00:00
mpeg VDR vs. BIN fixed?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3771 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
cd20c67951
commit
63dc65aa44
@ -278,8 +278,8 @@ do{
|
|||||||
// sure: head=0x000001XX
|
// sure: head=0x000001XX
|
||||||
mp_dbg(MSGT_DEMUX,MSGL_DBG4,"*** head=0x%X\n",head);
|
mp_dbg(MSGT_DEMUX,MSGL_DBG4,"*** head=0x%X\n",head);
|
||||||
if(demux->synced==0){
|
if(demux->synced==0){
|
||||||
if(head==0x1BA) demux->synced=1; else
|
if(head==0x1BA) demux->synced=1; //else
|
||||||
if(head==0x1BD || (head>=0x1C0 && head<=0x1EF)) demux->synced=3; // PES?
|
// if(head==0x1BD || (head>=0x1C0 && head<=0x1EF)) demux->synced=3; // PES?
|
||||||
} else
|
} else
|
||||||
if(demux->synced==1){
|
if(demux->synced==1){
|
||||||
if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){
|
if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){
|
||||||
|
@ -441,9 +441,20 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
|
|||||||
//=============== Try to open as MPEG-PS file: =================
|
//=============== Try to open as MPEG-PS file: =================
|
||||||
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
|
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
|
||||||
int pes=1;
|
int pes=1;
|
||||||
|
int tmp;
|
||||||
while(pes>=0){
|
while(pes>=0){
|
||||||
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
|
demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
|
||||||
if(!pes) demuxer->synced=1; // hack!
|
|
||||||
|
// try to pre-detect PES:
|
||||||
|
tmp=stream_read_dword(demuxer->stream);
|
||||||
|
if(tmp==0x1E0 || tmp==0x1C0){
|
||||||
|
tmp=stream_read_word(demuxer->stream);
|
||||||
|
if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES...
|
||||||
|
}
|
||||||
|
stream_seek(demuxer->stream,0);
|
||||||
|
|
||||||
|
if(!pes) demuxer->synced=3; // hack!
|
||||||
|
|
||||||
num_elementary_packets100=0;
|
num_elementary_packets100=0;
|
||||||
num_elementary_packets101=0;
|
num_elementary_packets101=0;
|
||||||
num_elementary_packets1B6=0;
|
num_elementary_packets1B6=0;
|
||||||
|
Loading…
Reference in New Issue
Block a user