From fd016f45074cc5afd114163fb2d9390022e2e7d5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 5 Oct 2012 14:55:19 +0200 Subject: [PATCH] decoder/ffmpeg: show unsupported sample format name Use av_get_sample_fmt_string() to obtain a human-readable string. --- src/decoder/ffmpeg_decoder_plugin.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index c9389b866..bab6968e8 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -376,10 +376,21 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt) return SAMPLE_FORMAT_S32; default: + break; + } + +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1) + char buffer[64]; + const char *name = av_get_sample_fmt_string(buffer, sizeof(buffer), + sample_fmt); + if (name != NULL) + g_warning("Unsupported libavcodec SampleFormat value: %s (%d)", + name, sample_fmt); + else +#endif g_warning("Unsupported libavcodec SampleFormat value: %d", sample_fmt); - return SAMPLE_FORMAT_UNDEFINED; - } + return SAMPLE_FORMAT_UNDEFINED; } static AVInputFormat *