From 91626b1c0606afb9bb582070e8a444a3ba8395ab Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 7 Nov 2013 22:12:36 +0100
Subject: audio: replace af_fmt2str_short -> af_fmt_to_str

Also, remove all af_fmt2str usages.
---
 audio/filter/af_bs2b.c       | 3 +--
 audio/filter/af_dummy.c      | 2 +-
 audio/filter/af_lavcac3enc.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'audio/filter')

diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
index aa92b8be23..0e77b3e4eb 100644
--- a/audio/filter/af_bs2b.c
+++ b/audio/filter/af_bs2b.c
@@ -74,7 +74,6 @@ static int control(struct af_instance *af, int cmd, void *arg)
     switch (cmd) {
     case AF_CONTROL_REINIT: {
         int format;
-        char buf[256];
         // Sanity check
         if (!arg) return AF_ERROR;
 
@@ -150,7 +149,7 @@ static int control(struct af_instance *af, int cmd, void *arg)
         }
         bs2b_set_srate(s->filter, (long)af->data->rate);
         mp_msg(MSGT_AFILTER, MSGL_V, "[bs2b] using format %s\n",
-               af_fmt2str(af->data->format,buf,256));
+               af_fmt_to_str(af->data->format));
 
         return af_test_output(af,(struct mp_audio*)arg);
     }
diff --git a/audio/filter/af_dummy.c b/audio/filter/af_dummy.c
index 03c9aa9e99..ab601ba9bb 100644
--- a/audio/filter/af_dummy.c
+++ b/audio/filter/af_dummy.c
@@ -34,7 +34,7 @@ static int control(struct af_instance* af, int cmd, void* arg)
   case AF_CONTROL_REINIT: ;
     *af->data = *(struct mp_audio*)arg;
     mp_msg(MSGT_AFILTER, MSGL_V, "[dummy] Was reinitialized: %iHz/%ich/%s\n",
-	af->data->rate,af->data->nch,af_fmt2str_short(af->data->format));
+	af->data->rate,af->data->nch,af_fmt_to_str(af->data->format));
     return AF_OK;
   }
   return AF_UNKNOWN;
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index cd3548ea8f..9ca193017a 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -362,9 +362,8 @@ static int af_open(struct af_instance* af){
             break;
         }
     }
-    char buf[100];
     mp_msg(MSGT_AFILTER, MSGL_V, "[af_lavcac3enc]: in sample format: %s\n",
-           af_fmt2str(s->in_sampleformat, buf, 100));
+           af_fmt_to_str(s->in_sampleformat));
     s->pending_data_size = AF_NCH * AC3_FRAME_SIZE *
         af_fmt2bits(s->in_sampleformat) / 8;
     s->pending_data = malloc(s->pending_data_size);
-- 
cgit v1.2.3