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
16e5e13c
Commit
16e5e13c
authored
12 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
buffersrc: switch to an AVOptions-based shorthand system.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
8f3c440a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavfilter/avfilter.c
+0
-1
0 additions, 1 deletion
libavfilter/avfilter.c
libavfilter/buffersrc.c
+1
-5
1 addition, 5 deletions
libavfilter/buffersrc.c
with
1 addition
and
6 deletions
libavfilter/avfilter.c
+
0
−
1
View file @
16e5e13c
...
@@ -687,7 +687,6 @@ static const char *const filters_left_to_update[] = {
...
@@ -687,7 +687,6 @@ static const char *const filters_left_to_update[] = {
#if FF_API_ACONVERT_FILTER
#if FF_API_ACONVERT_FILTER
"aconvert"
,
"aconvert"
,
#endif
#endif
"buffer"
,
"pan"
,
"pan"
,
};
};
...
...
This diff is collapsed.
Click to expand it.
libavfilter/buffersrc.c
+
1
−
5
View file @
16e5e13c
...
@@ -320,8 +320,8 @@ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src)
...
@@ -320,8 +320,8 @@ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src)
static
const
AVOption
buffer_options
[]
=
{
static
const
AVOption
buffer_options
[]
=
{
{
"width"
,
NULL
,
OFFSET
(
w
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
V
},
{
"width"
,
NULL
,
OFFSET
(
w
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
V
},
{
"height"
,
NULL
,
OFFSET
(
h
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
V
},
{
"video_size"
,
NULL
,
OFFSET
(
w
),
AV_OPT_TYPE_IMAGE_SIZE
,
.
flags
=
V
},
{
"video_size"
,
NULL
,
OFFSET
(
w
),
AV_OPT_TYPE_IMAGE_SIZE
,
.
flags
=
V
},
{
"height"
,
NULL
,
OFFSET
(
h
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
V
},
{
"pix_fmt"
,
NULL
,
OFFSET
(
pix_fmt
),
AV_OPT_TYPE_PIXEL_FMT
,
.
flags
=
V
},
{
"pix_fmt"
,
NULL
,
OFFSET
(
pix_fmt
),
AV_OPT_TYPE_PIXEL_FMT
,
.
flags
=
V
},
#if FF_API_OLD_FILTER_OPTS
#if FF_API_OLD_FILTER_OPTS
/* those 4 are for compatibility with the old option passing system where each filter
/* those 4 are for compatibility with the old option passing system where each filter
...
@@ -507,9 +507,6 @@ static const AVFilterPad avfilter_vsrc_buffer_outputs[] = {
...
@@ -507,9 +507,6 @@ static const AVFilterPad avfilter_vsrc_buffer_outputs[] = {
{
NULL
}
{
NULL
}
};
};
static
const
char
*
const
buffer_shorthand
[]
=
{
"width"
,
"height"
,
"pix_fmt"
,
"time_base_num"
,
"time_base_den"
,
"sar_num"
,
"sar_den"
,
NULL
};
AVFilter
avfilter_vsrc_buffer
=
{
AVFilter
avfilter_vsrc_buffer
=
{
.
name
=
"buffer"
,
.
name
=
"buffer"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Buffer video frames, and make them accessible to the filterchain."
),
.
description
=
NULL_IF_CONFIG_SMALL
(
"Buffer video frames, and make them accessible to the filterchain."
),
...
@@ -522,7 +519,6 @@ AVFilter avfilter_vsrc_buffer = {
...
@@ -522,7 +519,6 @@ AVFilter avfilter_vsrc_buffer = {
.
inputs
=
NULL
,
.
inputs
=
NULL
,
.
outputs
=
avfilter_vsrc_buffer_outputs
,
.
outputs
=
avfilter_vsrc_buffer_outputs
,
.
priv_class
=
&
buffer_class
,
.
priv_class
=
&
buffer_class
,
.
shorthand
=
buffer_shorthand
,
};
};
static
const
AVFilterPad
avfilter_asrc_abuffer_outputs
[]
=
{
static
const
AVFilterPad
avfilter_asrc_abuffer_outputs
[]
=
{
...
...
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