[Mplayer-cvslog] CVS: main/libmpdemux demux_mf.c,1.4,1.5

[Zoltan Ponekker]

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

Modified Files:
	demux_mf.c 
Log Message:
add initial mPNG support

Index: demux_mf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demux_mf.c	10 Feb 2002 18:09:52 -0000	1.4
+++ demux_mf.c	11 Feb 2002 09:15:32 -0000	1.5
@@ -76,7 +76,7 @@
 
   // go back to the beginning
   stream_reset(demuxer->stream);
-  stream_seek(demuxer->stream, 0);
+//  stream_seek(demuxer->stream, 0);
   demuxer->movi_start = 0;
   demuxer->movi_end = mf->nr_of_files - 1;
   dmf->nr_of_frames= mf->nr_of_files;
@@ -93,9 +93,11 @@
   // video_read_properties() will choke
   sh_video->ds = demuxer->video;
 
-  if ( !strcasecmp( mf_type,"jpg" ) ||
-	!(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G');
-   else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; }
+  if ( !strcasecmp( mf_type,"jpg" ) || 
+        !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G');
+   else 
+     if ( !strcasecmp( mf_type,"png" )) sh_video->format = mmioFOURCC('M', 'P', 'N', 'G' );
+       else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; }
 
   sh_video->disp_w = mf_w;
   sh_video->disp_h = mf_h;