From 793fd8c47996db74c7d10a2e101cd44311d7c06e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sun, 4 Nov 2018 22:36:17 +0100
Subject: [PATCH] decoder/ffmpeg: eliminate GetSampleFormat()

---
 src/decoder/plugins/FfmpegDecoderPlugin.cxx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 2b9b39b52..0f8abdd41 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -105,13 +105,6 @@ ffmpeg_finish() noexcept
 	av_dict_free(&avformat_options);
 }
 
-gcc_pure
-static AVSampleFormat
-GetSampleFormat(const AVCodecParameters &codec_params) noexcept
-{
-	return AVSampleFormat(codec_params.format);
-}
-
 gcc_pure
 static bool
 IsAudio(const AVStream &stream) noexcept
@@ -695,7 +688,7 @@ FfmpegScanStream(AVFormatContext &format_context,
 	const auto &codec_params = *stream.codecpar;
 	try {
 		handler.OnAudioFormat(CheckAudioFormat(codec_params.sample_rate,
-						       ffmpeg_sample_format(GetSampleFormat(codec_params)),
+						       ffmpeg_sample_format(AVSampleFormat(codec_params.format)),
 						       codec_params.channels));
 	} catch (...) {
 	}