aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-19 10:20:45 +0100
committerMax Kellermann <max@duempel.org>2014-12-19 10:20:45 +0100
commit3fe2f7337c666be76454ba0e691efe723f7ea865 (patch)
tree01f1d758adf4f24ad42883276292b62dbf986b1f
parentec24eb1d8ea3dee6eec056312a5e09b4354fa147 (diff)
downloadmpd-3fe2f7337c666be76454ba0e691efe723f7ea865.tar.gz
mpd-3fe2f7337c666be76454ba0e691efe723f7ea865.tar.xz
mpd-3fe2f7337c666be76454ba0e691efe723f7ea865.zip
decoder/ffmpeg: remove redundant audio stream check
-rw-r--r--src/decoder/plugins/FfmpegDecoderPlugin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 845127ebe..04025f2af 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -436,10 +436,10 @@ static void
FfmpegParseMetaData(const AVFormatContext &format_context, int audio_stream,
ReplayGainInfo &rg, MixRampInfo &mr)
{
- FfmpegParseMetaData(*format_context.metadata, rg, mr);
+ assert(audio_stream >= 0);
- if (audio_stream >= 0)
- FfmpegParseMetaData(*format_context.streams[audio_stream],
+ FfmpegParseMetaData(*format_context.metadata, rg, mr);
+ FfmpegParseMetaData(*format_context.streams[audio_stream],
rg, mr);
}