Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
6495c4c6
Commit
6495c4c6
authored
Aug 17, 2015
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.
parent
c1507db6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
ffmpeg_filter.c
ffmpeg_filter.c
+1
-1
avfilter.c
libavfilter/avfilter.c
+2
-1
vf_aspect.c
libavfilter/vf_aspect.c
+1
-1
No files found.
ffmpeg_filter.c
View file @
6495c4c6
...
...
@@ -544,7 +544,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
av_get_default_channel_layout
(
ost
->
audio_channels_mapped
));
for
(
i
=
0
;
i
<
ost
->
audio_channels_mapped
;
i
++
)
if
(
ost
->
audio_channels_map
[
i
]
!=
-
1
)
av_bprintf
(
&
pan_buf
,
"
:
c%d=c%d"
,
i
,
ost
->
audio_channels_map
[
i
]);
av_bprintf
(
&
pan_buf
,
"
|
c%d=c%d"
,
i
,
ost
->
audio_channels_map
[
i
]);
AUTO_INSERT_FILTER
(
"-map_channel"
,
"pan"
,
pan_buf
.
str
);
av_bprint_finalize
(
&
pan_buf
,
NULL
);
...
...
libavfilter/avfilter.c
View file @
6495c4c6
...
...
@@ -976,8 +976,9 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
if
(
ret
<
0
)
goto
fail
;
}
else
#endif
}
else
{
{
ret
=
process_options
(
filter
,
&
options
,
args
);
if
(
ret
<
0
)
goto
fail
;
...
...
libavfilter/vf_aspect.c
View file @
6495c4c6
...
...
@@ -69,10 +69,10 @@ typedef struct AspectContext {
static
av_cold
int
init
(
AVFilterContext
*
ctx
)
{
#if FF_API_OLD_FILTER_OPTS
AspectContext
*
s
=
ctx
->
priv
;
int
ret
;
#if FF_API_OLD_FILTER_OPTS
if
(
s
->
ratio_expr
&&
s
->
aspect_den
>
0
)
{
double
num
;
av_log
(
ctx
,
AV_LOG_WARNING
,
...
...
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