[Mplayer-cvslog] CVS: main demuxer.c,1.31,1.32

Arpi of Ize arpi at mplayer.dev.hu
Sat Oct 6 13:29:39 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv6048

Modified Files:
	demuxer.c 
Log Message:
ehh. 10l. required for MOV

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/demuxer.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- demuxer.c	2 Oct 2001 21:45:40 -0000	1.31
+++ demuxer.c	6 Oct 2001 11:29:18 -0000	1.32
@@ -159,6 +159,7 @@
 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
 int demux_asf_fill_buffer(demuxer_t *demux);
+int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
 
 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
   // Note: parameter 'ds' can be NULL!
@@ -170,6 +171,7 @@
     case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds);
     case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds);
     case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
+    case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
   }
   return 0;
 }
@@ -454,6 +456,8 @@
 switch(file_format){
  case DEMUXER_TYPE_MOV: {
   mov_read_header(demuxer);
+  sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
+  sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio;
   break;
  }
  case DEMUXER_TYPE_AVI: {




More information about the MPlayer-cvslog mailing list