[MPlayer-cvslog] CVS: main/libmpdemux demux_mpg.c, 1.61, 1.62 video.c, 1.52, 1.53

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv22557

Modified Files:
	demux_mpg.c video.c 
Log Message:
Fix mpeg-pes playback


Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- demux_mpg.c	26 Aug 2005 17:40:01 -0000	1.61
+++ demux_mpg.c	26 Aug 2005 22:53:59 -0000	1.62
@@ -804,7 +804,7 @@
 
 static int demux_mpg_pes_probe(demuxer_t *demuxer) {
    demuxer->synced = 3;
-   return demux_mpg_probe(demuxer);
+   return (demux_mpg_probe(demuxer) == DEMUXER_TYPE_MPEG_PS) ? DEMUXER_TYPE_MPEG_PES : 0;
 }
 
 
@@ -874,7 +874,7 @@
   0, // unsafe autodetect
   demux_mpg_pes_probe,
   demux_mpg_fill_buffer,
-  NULL,
+  demux_mpg_ps_open,
   demux_close_mpg,
   demux_seek_mpg,
   NULL

Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- video.c	26 Aug 2005 17:40:02 -0000	1.52
+++ video.c	26 Aug 2005 22:53:59 -0000	1.53
@@ -47,6 +47,7 @@
 if((d_video->demuxer->file_format == DEMUXER_TYPE_PVA) ||
    (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES) ||
    (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_GXF) ||
+   (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PES) ||
    (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
    (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TY) ||
    (d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_TS && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
@@ -405,6 +406,7 @@
 
   if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || 
      demuxer->file_format==DEMUXER_TYPE_MPEG_GXF ||
+     demuxer->file_format==DEMUXER_TYPE_MPEG_PES ||
   	(demuxer->file_format==DEMUXER_TYPE_MPEG_PS && ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
 		  || demuxer->file_format==DEMUXER_TYPE_PVA || 
 		  ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002)))
@@ -596,6 +598,7 @@
     }
     
     if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||
+       demuxer->file_format==DEMUXER_TYPE_MPEG_PES ||
        ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
        demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
        demuxer->file_format==DEMUXER_TYPE_MPEG_TY){