oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffmpeg: remove duplicate sample format error message

Browse Source
This commit is contained in:
Max Kellermann 2012-10-05 14:52:30 +02:00
parent 03a401e477
commit ddc0283339
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/ffmpeg_decoder_plugin.c
View File

@ -485,11 +485,16 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
return; return;
} }
const enum sample_format sample_format =
ffmpeg_sample_format(codec_context);
if (sample_format == SAMPLE_FORMAT_UNDEFINED)
return;
GError *error = NULL; GError *error = NULL;
struct audio_format audio_format; struct audio_format audio_format;
if (!audio_format_init_checked(&audio_format, if (!audio_format_init_checked(&audio_format,
codec_context->sample_rate, codec_context->sample_rate,
ffmpeg_sample_format(codec_context), sample_format,
codec_context->channels, &error)) { codec_context->channels, &error)) {
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);