From 3fe2f7337c666be76454ba0e691efe723f7ea865 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 19 Dec 2014 10:20:45 +0100
Subject: decoder/ffmpeg: remove redundant audio stream check
---
src/decoder/plugins/FfmpegDecoderPlugin.cxx | 6 +++---
1 file 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);
}
--
cgit v1.2.3