[Mplayer-cvslog] CVS: main/libmpcodecs dec_audio.c,1.31,1.32

Reimar Döffinger CVS syncmail at mplayerhq.hu
Thu Sep 16 21:51:15 CEST 2004


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv8880/libmpcodecs

Modified Files:
	dec_audio.c 
Log Message:
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.


Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dec_audio.c	14 May 2004 21:16:00 -0000	1.31
+++ dec_audio.c	16 Sep 2004 19:51:13 -0000	1.32
@@ -49,25 +49,6 @@
 
 int init_audio_codec(sh_audio_t *sh_audio)
 {
-
-  // reset in/out buffer size/pointer:
-  sh_audio->a_buffer_size=0;
-  sh_audio->a_buffer=NULL;
-  sh_audio->a_in_buffer_size=0;
-  sh_audio->a_in_buffer=NULL;
-
-  // Set up some common usefull defaults. ad->preinit() can override these:
-  
-  sh_audio->samplesize=2;
-  sh_audio->sample_format=AFMT_S16_NE;
-  sh_audio->samplerate=0;
-  sh_audio->channels=0;
-  sh_audio->i_bps=0;  // input rate (bytes/sec)
-  sh_audio->o_bps=0;  // output rate (bytes/sec)
-
-  sh_audio->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
-  sh_audio->audio_in_minsize=0;
-  
   if(!mpadec->preinit(sh_audio))
   {
       mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ADecoderPreinitFailed);




More information about the MPlayer-cvslog mailing list