Mercurial > mplayer.hg

changeset 14172:67912fc34e04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set mixer.afilter at a more appropriate place.
author reimar
date Fri, 17 Dec 2004 16:23:50 +0000
parents 83a1fd8cbdd1
children e2a4a2ce54a8
files mplayer.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Dec 17 13:30:29 2004 +0000
+++ b/mplayer.c	Fri Dec 17 16:23:50 2004 +0000
@@ -924,8 +924,12 @@
 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data)
 {
   int new_srate;
+  int result;
   if (!sh_audio)
+  {
+    mixer.afilter = NULL;
     return 0;
+  }
   new_srate = sh_audio->samplerate * playback_speed;
   if (new_srate != ao_data->samplerate) {
     // limits are taken from libaf/af_resample.c
@@ -935,11 +939,13 @@
       new_srate = 192000;
     playback_speed = (float)new_srate / (float)sh_audio->samplerate;
   }
-  return init_audio_filters(sh_audio, new_srate,
+  result =  init_audio_filters(sh_audio, new_srate,
            sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
            ao_data->samplerate, ao_data->channels, ao_data->format,
            audio_out_format_bits(ao_data->format) / 8, /* ao_data.bps, */
            ao_data->outburst * 4, ao_data->buffersize);
+  mixer.afilter = sh_audio->afilter;
+  return result;
 }
 
 int main(int argc,char* argv[]){
@@ -2128,7 +2134,6 @@
 #endif
   }
   mixer.audio_out = audio_out;
-  mixer.afilter = sh_audio ? sh_audio->afilter : NULL;
   mixer.volstep = volstep;
 }