[Mplayer-cvslog] CVS: main/libmpdemux demuxer.c,1.169,1.170

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	demuxer.c 
Log Message:
Support ON2 variation of AVI format (.vp5 files)
Also closes bug #104


Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- demuxer.c	1 Oct 2004 19:51:03 -0000	1.169
+++ demuxer.c	8 Oct 2004 21:28:19 -0000	1.170
@@ -697,13 +697,17 @@
   demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id);
   { //---- RIFF header:
     int id=stream_read_dword_le(demuxer->stream); // "RIFF"
-    if(id==mmioFOURCC('R','I','F','F')){
+    if((id==mmioFOURCC('R','I','F','F')) || (id==mmioFOURCC('O','N','2',' '))){
       stream_read_dword_le(demuxer->stream); //filesize
       id=stream_read_dword_le(demuxer->stream); // "AVI "
       if(id==formtypeAVI){ 
         mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI");
         file_format=DEMUXER_TYPE_AVI;
       }	
+      if(id==mmioFOURCC('O','N','2','f')){ 
+        mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ON2 AVI");
+        file_format=DEMUXER_TYPE_AVI;
+      }	
     }
     if (file_format==DEMUXER_TYPE_UNKNOWN) {
       free_demuxer(demuxer);