[MPlayer-cvslog] r19331 - trunk/libmpdemux/demux_mov.c

[nicodvb]

Author: nicodvb
Date: Fri Aug  4 22:18:21 2006
New Revision: 19331

Modified:
   trunk/libmpdemux/demux_mov.c

Log:
auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	(original)
+++ trunk/libmpdemux/demux_mov.c	Fri Aug  4 22:18:21 2006
@@ -1890,6 +1890,24 @@
 	}
     }
 
+    if(demuxer->video->id<0 && demuxer->audio->id<0) {
+        /* No AV streams found. Try to find an MPEG stream. */
+        for(t_no=0;t_no<priv->track_db;t_no++){
+            mov_track_t* trak=priv->tracks[t_no];
+            if(trak->media_handler == MOV_FOURCC('M','P','E','G')) {
+                stream_t *s;
+                demuxer_t *od;
+    
+                demuxer->video->id = t_no;
+                s = new_ds_stream(demuxer->video);
+                od = demux_open(s, DEMUXER_TYPE_MPEG_PS, -1, -1, -1, NULL);
+                if(od) return new_demuxers_demuxer(od, od, od);
+                demuxer->video->id = -2;	//new linked demuxer couldn't be allocated
+                break;
+            }
+        }
+    }
+
 #if 0
     if( mp_msg_test(MSGT_DEMUX,MSGL_DBG3) ){
 	for(t_no=0;t_no<priv->track_db;t_no++){