Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
793fd8c4
Commit
793fd8c4
authored
6 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/ffmpeg: eliminate GetSampleFormat()
parent
6c602811
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
8 deletions
+1
-8
FfmpegDecoderPlugin.cxx
src/decoder/plugins/FfmpegDecoderPlugin.cxx
+1
-8
No files found.
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @
793fd8c4
...
...
@@ -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
(...)
{
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment