diff libmpdemux/demuxer.c @ 13357:c605df89ca9f

moved sh_audio initialization from dec_audio to demuxer.c to fix -hr-mp3-seek bug (pts was -inf after seeking) and remove the workaround from demux_audio.c.

--- a/libmpdemux/demuxer.c	Thu Sep 16 19:42:54 2004 +0000
+++ b/libmpdemux/demuxer.c	Thu Sep 16 19:51:13 2004 +0000
@@ -18,6 +18,7 @@
 #include "stheader.h"
 #include "mf.h"
 
+#include "../libao2/afmt.h"
 #include "../libvo/fastmemcpy.h"
 
 void free_demuxer_stream(demux_stream_t *ds){
@@ -79,9 +80,15 @@
     if(demuxer->a_streams[id]){
         mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_AudioStreamRedefined,id);
     } else {
+        sh_audio_t *sh;
         mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id);
         demuxer->a_streams[id]=malloc(sizeof(sh_audio_t));
         memset(demuxer->a_streams[id],0,sizeof(sh_audio_t));
+        sh = demuxer->a_streams[id];
+        // set some defaults
+        sh->samplesize=2;
+        sh->sample_format=AFMT_S16_NE;
+        sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
     }
     return demuxer->a_streams[id];
 }