History

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

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

Michael Niedermayer committed 13 years ago

Commit 72ce9792 parents c2696da 531158e4 files · +3 −12Browse files

Unified · Split

4 files
  1. doc/filters.texi +1 −7
  2. libavfilter/avfilter.c +2 −0
  3. libavfilter/vf_il.c +0 −3
  4. libavfilter/vf_kerndeint.c +0 −2
doc/filters.texi+1−7
@@ -3745,8 +3745,7 @@ fields (so called half pictures). Odd lines are moved to the top · 3744 unmodified lines
37453745 half of the output image, even lines to the bottom half.
37463746 You can process (filter) them independently and then re-interleave them.
37473747
3748−It accepts a list of options in the form of @var{key}=@var{value} pairs
3749−separated by ":". A description of the accepted options follows.
3748+The filter accepts the following options:
37503749
37513750 @table @option
37523751 @item luma_mode, l
@@ -3779,11 +3778,6 @@ Deinterlace input video by applying Donald Graft's adaptive kernel · 26 unmodified lines
37793778 deinterling. Work on interlaced parts of a video to produce
37803779 progressive frames.
37813780
3782−This filter accepts parameters as a list of @var{key}=@var{value}
3783−pairs, separated by ":". If the key of the first options is omitted,
3784−the arguments are interpreted according to the following syntax:
3785−@var{thresh}:@var{map}:@var{order}:@var{sharp}:@var{twoway}.
3786−
37873781 The description of the accepted parameters follows.
37883782
37893783 @table @option
libavfilter/avfilter.c+2−0
@@ -680,6 +680,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 679 unmodified lines
680680 !strcmp(filter->filter->name, "geq" ) ||
681681 !strcmp(filter->filter->name, "gradfun" ) ||
682682 !strcmp(filter->filter->name, "hqdn3d" ) ||
683+ !strcmp(filter->filter->name, "il" ) ||
684+ !strcmp(filter->filter->name, "kerndeint" ) ||
683685 !strcmp(filter->filter->name, "ocv" ) ||
684686 !strcmp(filter->filter->name, "life" ) ||
685687 !strcmp(filter->filter->name, "lut" ) ||
libavfilter/vf_il.c+0−3
@@ -204,8 +204,6 @@ static const AVFilterPad outputs[] = { · 203 unmodified lines
204204 { NULL }
205205 };
206206
207−static const char *const shorthand[] = { NULL };
208−
209207 AVFilter avfilter_vf_il = {
210208 .name = "il",
211209 .description = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."),
@@ -214,5 +212,4 @@ AVFilter avfilter_vf_il = { · 2 unmodified lines
214212 .inputs = inputs,
215213 .outputs = outputs,
216214 .priv_class = &il_class,
217− .shorthand = shorthand,
218215 };
libavfilter/vf_kerndeint.c+0−2
@@ -305,7 +305,6 @@ static const AVFilterPad kerndeint_outputs[] = { · 304 unmodified lines
305305 { NULL }
306306 };
307307
308−static const char *const shorthand[] = { "thresh", "map", "order", "sharp", "twoway", NULL };
309308
310309 AVFilter avfilter_vf_kerndeint = {
311310 .name = "kerndeint",
@@ -318,5 +317,4 @@ AVFilter avfilter_vf_kerndeint = { · 6 unmodified lines
318317 .outputs = kerndeint_outputs,
319318
320319 .priv_class = &kerndeint_class,
321− .shorthand = shorthand,
322320 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t