Mercurial > mplayer.hg

changeset 13588:d1ff5291daed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support ON2 variation of AVI format (.vp5 files) Also closes bug #104
author rtognimp
date Fri, 08 Oct 2004 21:28:19 +0000
parents 3fd5fc67f386
children b158faf16c92
files libmpdemux/demuxer.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Fri Oct 08 21:12:49 2004 +0000
+++ b/libmpdemux/demuxer.c	Fri Oct 08 21:28:19 2004 +0000
@@ -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);