diff options
author | Max Kellermann <max@musicpd.org> | 2018-11-04 22:36:17 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2018-11-04 22:36:17 +0100 |
commit | 793fd8c47996db74c7d10a2e101cd44311d7c06e (patch) | |
tree | a0fe7adcd0108943e4586f8c14ec6ba99bfa4fef /src/decoder/plugins | |
parent | 6c602811df5f765cfc9ee92bf8cf97fca96b47d7 (diff) |
decoder/ffmpeg: eliminate GetSampleFormat()
Diffstat (limited to 'src/decoder/plugins')
-rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 9 |
1 files changed, 1 insertions, 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 @@ -106,13 +106,6 @@ ffmpeg_finish() noexcept } 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 (...) { } |