har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buffersrc: switch to an AVOptions-based shorthand system.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-12 09:45:14 +02:00
parent 8f3c440a39
commit 16e5e13c7e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/avfilter.c
View File

@ -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",
}; };

6
libavfilter/buffersrc.c
View File

@ -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[] = {
{ 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 = {
.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[] = {