Commit 793fd8c4 authored by Max Kellermann's avatar Max Kellermann

decoder/ffmpeg: eliminate GetSampleFormat()

parent 6c602811
...@@ -106,13 +106,6 @@ ffmpeg_finish() noexcept ...@@ -106,13 +106,6 @@ ffmpeg_finish() noexcept
} }
gcc_pure gcc_pure
static AVSampleFormat
GetSampleFormat(const AVCodecParameters &codec_params) noexcept
{
return AVSampleFormat(codec_params.format);
}
gcc_pure
static bool static bool
IsAudio(const AVStream &stream) noexcept IsAudio(const AVStream &stream) noexcept
{ {
...@@ -695,7 +688,7 @@ FfmpegScanStream(AVFormatContext &format_context, ...@@ -695,7 +688,7 @@ FfmpegScanStream(AVFormatContext &format_context,
const auto &codec_params = *stream.codecpar; const auto &codec_params = *stream.codecpar;
try { try {
handler.OnAudioFormat(CheckAudioFormat(codec_params.sample_rate, handler.OnAudioFormat(CheckAudioFormat(codec_params.sample_rate,
ffmpeg_sample_format(GetSampleFormat(codec_params)), ffmpeg_sample_format(AVSampleFormat(codec_params.format)),
codec_params.channels)); codec_params.channels));
} catch (...) { } catch (...) {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment