[Mplayer-cvslog] CVS: main/libmpdemux demuxer.c,1.95,1.96

[Alban Bedel CVS]

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

Modified Files:
	demuxer.c 
Log Message:
Add support for another AVI with ogg/vorbis audio (0x674F)


Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- demuxer.c	24 Apr 2002 17:28:23 -0000	1.95
+++ demuxer.c	29 Apr 2002 13:36:18 -0000	1.96
@@ -800,8 +800,22 @@
    demuxer = (demuxer_t*) demux_open_avi(demuxer);
    if(!demuxer) return NULL; // failed to open
    sh_a = (sh_audio_t*)demuxer->audio->sh;
-   if(demuxer->audio->id != -2 && sh_a && sh_a->format == 0xFFFE)
-     demuxer = init_avi_with_ogg(demuxer);
+   if(demuxer->audio->id != -2 && sh_a) {
+     if(sh_a->format == 0xFFFE)
+       demuxer = init_avi_with_ogg(demuxer);
+     else if(sh_a->format == 0x674F) {
+       stream_t* s;
+       demuxer_t  *od;
+       s = new_ds_stream(demuxer->audio);
+       od = new_demuxer(s,DEMUXER_TYPE_OGG,-1,-2,-2);
+       if(!demux_ogg_open(od)) {
+	 mp_msg( MSGT_DEMUXER,MSGL_ERR,"Unable to open the ogg demuxer\n");
+	 free_stream(s);
+	 demuxer->audio->id = -2;
+       } else
+	 demuxer = new_demuxers_demuxer(demuxer,od,demuxer);
+     }
+   }       
    return demuxer;
 //  break;
  }