From 60c06fec1e45e1ddb285fe54f1106e1fc8838edd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 18:29:42 +0100 Subject: audio/fmt-conversion.c: remove unknown audio format messages Same deal as with video/fmt-conversion.c. --- audio/fmt-conversion.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'audio/fmt-conversion.c') diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c index 65f84945c1..6072305424 100644 --- a/audio/fmt-conversion.c +++ b/audio/fmt-conversion.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "common/msg.h" #include #include #include "format.h" @@ -43,24 +42,18 @@ static const struct { enum AVSampleFormat af_to_avformat(int fmt) { - int i; - for (i = 0; audio_conversion_map[i].fmt; i++) + for (int i = 0; audio_conversion_map[i].fmt; i++) { if (audio_conversion_map[i].fmt == fmt) - break; - return audio_conversion_map[i].sample_fmt; + return audio_conversion_map[i].sample_fmt; + } + return 0; } int af_from_avformat(enum AVSampleFormat sample_fmt) { - int i; - for (i = 0; audio_conversion_map[i].fmt; i++) + for (int i = 0; audio_conversion_map[i].fmt; i++) { if (audio_conversion_map[i].sample_fmt == sample_fmt) - break; - int fmt = audio_conversion_map[i].fmt; - if (!fmt) { - const char *fmtname = av_get_sample_fmt_name(sample_fmt); - mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVSampleFormat %s (%d)\n", - fmtname ? fmtname : "INVALID", sample_fmt); + return audio_conversion_map[i].fmt; } - return fmt; + return 0; } -- cgit v1.2.3