[Mplayer-cvslog] CVS: main/libmpdemux aviheader.c,1.28,1.29 aviheader.h,1.2,1.3 demux_avi.c,1.31,1.32

[Arpi of Ize]

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

Modified Files:
	aviheader.c aviheader.h demux_avi.c 
Log Message:
AVI - no audio stream fix

Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- aviheader.c	29 Aug 2001 17:39:10 -0000	1.28
+++ aviheader.c	21 Oct 2001 12:18:45 -0000	1.29
@@ -40,6 +40,7 @@
 
 //---- AVI header:
 priv->idx_size=0;
+priv->audio_streams=0;
 while(1){
   int id=stream_read_dword_le(demuxer->stream);
   int chunksize,size2;
@@ -141,6 +142,7 @@
 	}
         chunksize=0;
         if(verbose>=1) print_wave_header(sh_audio->wf);
+	++priv->audio_streams;
 //        if(demuxer->audio->id==-1) demuxer->audio->id=stream_id;
       }
       break;

Index: aviheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aviheader.h	11 Aug 2001 20:37:33 -0000	1.2
+++ aviheader.h	21 Oct 2001 12:18:45 -0000	1.3
@@ -95,6 +95,7 @@
   int idx_offset;  // ennyit kell hozzaadni az index offset ertekekhez
   // interleaved PTS stuff:
   int skip_video_frames;
+  int audio_streams;
   float avi_audio_pts;
   float avi_video_pts;
   float pts_correction;

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- demux_avi.c	20 Oct 2001 20:03:10 -0000	1.31
+++ demux_avi.c	21 Oct 2001 12:18:45 -0000	1.32
@@ -456,7 +456,7 @@
   sh_video=d_video->sh;sh_video->ds=d_video;
   if(d_audio->id!=-2){
     mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id);
-    if(!ds_fill_buffer(d_audio)){
+    if(!priv->audio_streams || !ds_fill_buffer(d_audio)){
       mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: " MSGTR_MissingAudioStream);
       sh_audio=NULL;
     } else {