Simplify init_audio_filters() arguments

Remove the following arguments as redundant: in_channels, in_format,
out_minsize, out_maxsize. The first two always equal fields of the
sh_audio_t struct given as the first argument to the function. The
last two are unused after the allocation of sh_audio->a_out_buffer
was changed to be done on demand.

After the out_minsize and out_maxsize arguments are removed the
function preinit_audio_filters() is identical to init_audio_filters(),
so remove it and use the latter instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24922 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 5 insertions, 21 deletions

diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index eb11650f59..de94987371 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -313,19 +313,8 @@ void uninit_audio(sh_audio_t *sh_audio)
 }
 
 
-int preinit_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
-			  int in_channels, int in_format, int *out_samplerate,
-			  int *out_channels, int *out_format)
-{
-    return init_audio_filters(sh_audio, in_samplerate, in_channels, in_format,
-			      out_samplerate, out_channels, out_format, 0, 0);
-}
-
-
 int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
-		       int in_channels, int in_format, int *out_samplerate,
-		       int *out_channels, int *out_format,
-		       int out_minsize, int out_maxsize)
+		       int *out_samplerate, int *out_channels, int *out_format)
 {
     af_stream_t *afs = sh_audio->afilter;
     if (!afs) {
@@ -334,8 +323,8 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
     }
     // input format: same as codec's output format:
     afs->input.rate   = in_samplerate;
-    afs->input.nch    = in_channels;
-    afs->input.format = in_format;
+    afs->input.nch    = sh_audio->channels;
+    afs->input.format = sh_audio->sample_format;
     af_fix_parameters(&(afs->input));
 
     // output format: same as ao driver's input format (if missing, fallback to input)
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h
index e5d71b8792..37b3c27db7 100644
--- a/libmpcodecs/dec_audio.h
+++ b/libmpcodecs/dec_audio.h
@@ -7,10 +7,5 @@ extern void resync_audio_stream(sh_audio_t *sh_audio);
 extern void skip_audio_frame(sh_audio_t *sh_audio);
 extern void uninit_audio(sh_audio_t *sh_audio);
 
-extern int init_audio_filters(sh_audio_t *sh_audio, 
-	int in_samplerate, int in_channels, int in_format,
-	int *out_samplerate, int *out_channels, int *out_format,
-	int out_minsize, int out_maxsize);
-extern int preinit_audio_filters(sh_audio_t *sh_audio,
-        int in_samplerate, int in_channels, int in_format,
-        int* out_samplerate, int* out_channels, int* out_format);
+extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
+		int *out_samplerate, int *out_channels, int *out_format);