Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
a297856b
Commit
a297856b
authored
13 years ago
by
Nicolas George
Browse files
Options
Downloads
Patches
Plain Diff
af_pan: reindent after last commit.
parent
a44b510d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavfilter/af_pan.c
+21
-23
21 additions, 23 deletions
libavfilter/af_pan.c
with
21 additions
and
23 deletions
libavfilter/af_pan.c
+
21
−
23
View file @
a297856b
...
@@ -235,24 +235,23 @@ static int config_props(AVFilterLink *link)
...
@@ -235,24 +235,23 @@ static int config_props(AVFilterLink *link)
}
}
}
}
/* TODO reindent */
// sanity check; can't be done in query_formats since the inlink
// sanity check; can't be done in query_formats since the inlink
// channel layout is unknown at that time
// channel layout is unknown at that time
if
(
pan
->
nb_input_channels
>
SWR_CH_MAX
||
if
(
pan
->
nb_input_channels
>
SWR_CH_MAX
||
pan
->
nb_output_channels
>
SWR_CH_MAX
)
{
pan
->
nb_output_channels
>
SWR_CH_MAX
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
av_log
(
ctx
,
AV_LOG_ERROR
,
"libswresample support a maximum of %d channels. "
"libswresample support a maximum of %d channels. "
"Feel free to ask for a higher limit.
\n
"
,
SWR_CH_MAX
);
"Feel free to ask for a higher limit.
\n
"
,
SWR_CH_MAX
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
// init libswresample context
// init libswresample context
pan
->
swr
=
swr_alloc_set_opts
(
pan
->
swr
,
pan
->
swr
=
swr_alloc_set_opts
(
pan
->
swr
,
pan
->
out_channel_layout
,
link
->
format
,
link
->
sample_rate
,
pan
->
out_channel_layout
,
link
->
format
,
link
->
sample_rate
,
link
->
channel_layout
,
link
->
format
,
link
->
sample_rate
,
link
->
channel_layout
,
link
->
format
,
link
->
sample_rate
,
0
,
ctx
);
0
,
ctx
);
if
(
!
pan
->
swr
)
if
(
!
pan
->
swr
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
// gains are pure, init the channel mapping
// gains are pure, init the channel mapping
if
(
pan
->
pure_gains
)
{
if
(
pan
->
pure_gains
)
{
...
@@ -365,12 +364,11 @@ static int query_formats(AVFilterContext *ctx)
...
@@ -365,12 +364,11 @@ static int query_formats(AVFilterContext *ctx)
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVFilterLink
*
outlink
=
ctx
->
outputs
[
0
];
AVFilterFormats
*
formats
;
AVFilterFormats
*
formats
;
/* TODO reindent */
pan
->
pure_gains
=
are_gains_pure
(
pan
);
pan
->
pure_gains
=
are_gains_pure
(
pan
);
/* libswr supports any sample and packing formats */
/* libswr supports any sample and packing formats */
avfilter_set_common_sample_formats
(
ctx
,
avfilter_make_all_formats
(
AVMEDIA_TYPE_AUDIO
));
avfilter_set_common_sample_formats
(
ctx
,
avfilter_make_all_formats
(
AVMEDIA_TYPE_AUDIO
));
avfilter_set_common_packing_formats
(
ctx
,
avfilter_make_all_packing_formats
());
avfilter_set_common_packing_formats
(
ctx
,
avfilter_make_all_packing_formats
());
pan
->
filter_samples
=
filter_samples_channel_mapping
;
pan
->
filter_samples
=
filter_samples_channel_mapping
;
// inlink supports any channel layout
// inlink supports any channel layout
formats
=
avfilter_make_all_channel_layouts
();
formats
=
avfilter_make_all_channel_layouts
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment