* 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>

* commit 'e67a87ea':
  vf_(no)format: switch to an AVOptions-based system.
  af_aformat: switch to an AVOptions-based system.

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

* commit 'd28cb849':
  buffersrc: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/buffersrc.c

Commit not merged, merge left to maintainer.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4fa1f52e':
  af_resample: switch to an AVOptions-based system.

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

This expression is useful to enable/disable overlaying on the fly.

Note that this can't be easily done relying on the filtergraph structure,
since this implies caching issues or a null frame overlaying in the best
case, which is better avoided for performance and convenience reasons.

Add support for dynamic x, y expressions evaluation.

Also add support for an evaluation mode which allows to disable per-frame
evaluation, so that there is no speedloss in case the expression does not
depend on frame variables.

The new name is more semantically and stilistically consistent.

* commit 'b439c992':
  lavfi: switch to an AVOptions-based system.
  dfa: implement missing TDLT coding method

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

Signed-off-by: NJames Almer <jamrial@gmail.com>

From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Since the PTS need double accuracy, the timebase denominator is doubled
as well, and this new time base is used for the timestamp unit.

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

Fixes ticket #2412.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

* cigaes/master:
  ffmpeg: use a rational for -aspect option.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

The EC code does not support fields currently thus it makes no
sense to wait for these cases (which also the check doesnt handle
correctly)

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