* commit '33b97faa':
  vf_setpts: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/f_setpts.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* ubitux/shorthand-cleanup:
  lavfi/subtitles: switch to an AVOptions-based system.
  lavfi/pp: switch to an AVOptions-based system.
  lavfi/geq: switch to an AVOptions-based system.
  lavfi/edgedetect: switch to an AVOptions-based system.
  lavfi/curves: switch to an AVOptions-based system.
  lavfi/colormatrix: switch to an AVOptions-based system.
  lavfi/perms: switch to an AVOptions-based system.
  lavfi/ebur128: switch to an AVOptions-based system.
  lavfi/showspectrum: switch to an AVOptions-based system.
  lavfi/silencedetect: switch to an AVOptions-based system.
  lavfi/thumbnail: switch to an AVOptions-based system.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '95f1f56a':
  vf_select: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/f_select.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Also add and use the '|' separator instead of ':' since it's
incompatible with the new option system...

* commit '40c885c5':
  vf_pad: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_pad.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

* commit '9087eaf1':
  vf_overlay: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_overlay.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '20b46f8f':
  vf_lut: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_lut.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ee0e8d4b':
  vf_libopencv: switch to an AVOptions-based system.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8c747d46':
  vf_hqdn3d: switch to an AVOptions-based system.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '7ed833d7':
  vf_gradfun: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/gradfun.h
	libavfilter/vf_gradfun.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'c334c113':
  vf_scale: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.c
	libavfilter/vf_scale.c

scale keeps using our shorthand system due to the alternative not
supporting the more complex syntactical things like 1 parameter
dimensions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '5aa1a668':
  vf_frei0r: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_frei0r.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Reviewed-by: ubitux
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f13ab299':
  vf_fps: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_fps.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'a39c1540':
  vf_fieldorder: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_fieldorder.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b9dfee9f':
  vf_fade: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_fade.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8ec464c6':
  vf_drawtext: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_drawtext.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '335c3129':
  vf_drawbox: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_drawbox.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.

Based on a patch by littlebat <dashing.meng@gmail.com>.

Should fix trac ticket #2413.

The same message is shown already by the called function
ff_bufqueue_is_full().

* commit '63e58c55':
  vf_delogo: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_delogo.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '460e7b4f':
  vf_cropdetect: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_cropdetect.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'fba0156a':
  vf_crop: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_crop.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '51def31d':
  vf_boxblur: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_boxblur.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '62dcdb02':
  vf_blackframe: switch to an AVOptions-based system.
  vf_aspect: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c

In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>