generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'mbouron/shorthand-cleanup'

Browse Source 
* mbouron/shorthand-cleanup:
  lavfi/kerndeint: switch to AVOption-based system
  lavfi/il: switch to AVOption-based system

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 01:03:02 +02:00
commit 72ce979f10
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/filters.texi
View File

@ -3745,8 +3745,7 @@ fields (so called half pictures). Odd lines are moved to the top
half of the output image, even lines to the bottom half. half of the output image, even lines to the bottom half.
You can process (filter) them independently and then re-interleave them. You can process (filter) them independently and then re-interleave them.
It accepts a list of options in the form of @var{key}=@var{value} pairs The filter accepts the following options:
separated by ":". A description of the accepted options follows.
@table @option @table @option
@item luma_mode, l @item luma_mode, l
@ -3779,11 +3778,6 @@ Deinterlace input video by applying Donald Graft's adaptive kernel
deinterling. Work on interlaced parts of a video to produce deinterling. Work on interlaced parts of a video to produce
progressive frames. progressive frames.
This filter accepts parameters as a list of @var{key}=@var{value}
pairs, separated by ":". If the key of the first options is omitted,
the arguments are interpreted according to the following syntax:
@var{thresh}:@var{map}:@var{order}:@var{sharp}:@var{twoway}.
The description of the accepted parameters follows. The description of the accepted parameters follows.
@table @option @table @option

2
libavfilter/avfilter.c
View File

@ -680,6 +680,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "geq" ) || !strcmp(filter->filter->name, "geq" ) ||
!strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "gradfun" ) ||
!strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "hqdn3d" ) ||
!strcmp(filter->filter->name, "il" ) ||
!strcmp(filter->filter->name, "kerndeint" ) ||
!strcmp(filter->filter->name, "ocv" ) || !strcmp(filter->filter->name, "ocv" ) ||
!strcmp(filter->filter->name, "life" ) || !strcmp(filter->filter->name, "life" ) ||
!strcmp(filter->filter->name, "lut" ) || !strcmp(filter->filter->name, "lut" ) ||

3
libavfilter/vf_il.c
View File

@ -204,8 +204,6 @@ static const AVFilterPad outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { NULL };
AVFilter avfilter_vf_il = { AVFilter avfilter_vf_il = {
.name = "il", .name = "il",
.description = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."), .description = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."),
@ -214,5 +212,4 @@ AVFilter avfilter_vf_il = {
.inputs = inputs, .inputs = inputs,
.outputs = outputs, .outputs = outputs,
.priv_class = &il_class, .priv_class = &il_class,
.shorthand = shorthand,
}; };

2
libavfilter/vf_kerndeint.c
View File

@ -305,7 +305,6 @@ static const AVFilterPad kerndeint_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { "thresh", "map", "order", "sharp", "twoway", NULL };
AVFilter avfilter_vf_kerndeint = { AVFilter avfilter_vf_kerndeint = {
.name = "kerndeint", .name = "kerndeint",
@ -318,5 +317,4 @@ AVFilter avfilter_vf_kerndeint = {
.outputs = kerndeint_outputs, .outputs = kerndeint_outputs,
.priv_class = &kerndeint_class, .priv_class = &kerndeint_class,
.shorthand = shorthand,
}; };