* commit 'b7b3302f':
  vsrc_nullsrc: switch to an AVOptions-based system.

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

* commit '7bc1a883':
  vsrc_color: switch to an AVOptions-based system.

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

* commit '73d5d405':
  split: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b13623e1':
  af_volume: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* richardpl/biquads:
  lavfi/biquads: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dd7fc37c':
  af_join: switch to an AVOptions-based system.

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

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

* richardpl/framestep:
  lavfi/framestep: remove request_frame hack
  lavfi/framestep: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '3f14febb':
  af_channelsplit: switch to an AVOptions-based system.

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

* commit 'ba8efac9':
  af_channelmap: switch to an AVOptions-based system.

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

* mbouron/shorthand-cleanup:
  lavfi/aphaser: switch to AVOption-based system
  lavfi/apad: switch to AVOption-based system
  lavfi/afade: switch to AVOption-base system
  lavfi/blend: switch to AVOption-based system

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

* commit 'b2b25b06':
  af_asyncts: switch to an AVOptions-based system.

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

* commit 'ac20e3ab':
  af_amix: switch to an AVOptions-based system.

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

* commit '7536c671':
  vf_yadif: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_yadif.c
	libavfilter/yadif.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* ubitux/shorthand-cleanup:
  lavfi/idet: switch to an AVOptions-based system.
  lavfi/histogram: switch to an AVOptions-based system.
  lavfi/stereo3d: switch to an AVOptions-based system.
  lavfi/noise: switch to an AVOptions-based system.
  lavfi/histeq: switch to an AVOptions-based system.

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

* mbouron/shorthand-cleanup:
  lavfi/kerndeint: switch to AVOption-based system
  lavfi/il: switch to AVOption-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b83e9efc':
  vf_unsharp: switch to an AVOptions-based system.

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

* ubitux/shorthand-cleanup:
  lavfi/mptestsrc: switch to an AVOptions-based system.
  lavfi/mandelbrot: switch to an AVOptions-based system.
  lavfi/life: switch to an AVOptions-based system.
  lavfi/cellauto: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0c2466de':
  vf_transpose: switch to an AVOptions-based system.

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

Also remove mention to syntax explanation which is or will be redundant
and possibly confusing.

* commit 'ffea3b00':
  vf_settb: switch to an AVOptions-based system.

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