diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-10 19:01:38 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-14 00:47:22 +0100 |
| commit | 719990b1c5db93ccdc21e5f91e98ed9e8540ade1 (patch) | |
| tree | ef03f58f54767b73c4c8d267e7b0008938863a17 /src/decoder/ffmpeg_plugin.c | |
| parent | f47bb8c1db91b50be95c4d5dd301728e38c57274 (diff) | |
| download | mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.tar.gz mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.tar.xz mpd-719990b1c5db93ccdc21e5f91e98ed9e8540ade1.zip | |
decoder: use audio_format_init_checked()
Let the audio_check library verify the audio format in all (relevant,
i.e. non-hardcoded) plugins.
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/ffmpeg_plugin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index 41fc70908..3c96848bb 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -19,6 +19,7 @@ #include "config.h" #include "decoder_api.h" +#include "audio_check.h" #include <glib.h> @@ -260,6 +261,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, static bool ffmpeg_decode_internal(struct ffmpeg_context *ctx) { + GError *error = NULL; struct decoder *decoder = ctx->decoder; AVCodecContext *codec_context = ctx->codec_context; AVFormatContext *format_context = ctx->format_context; @@ -281,13 +283,11 @@ ffmpeg_decode_internal(struct ffmpeg_context *ctx) /* XXX fixme 16-bit for older ffmpeg (13 Aug 2007) */ bits = (uint8_t) 16; #endif - audio_format_init(&audio_format, codec_context->sample_rate, bits, - codec_context->channels); - - if (!audio_format_valid(&audio_format)) { - g_warning("Invalid audio format: %u:%u:%u\n", - audio_format.sample_rate, audio_format.bits, - audio_format.channels); + if (!audio_format_init_checked(&audio_format, + codec_context->sample_rate, bits, + codec_context->channels, &error)) { + g_warning("%s", error->message); + g_error_free(error); return false; } |