lavfi/decimate: switch to an AVOption-based system

lavfi/field: switch to AVOption-based system

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

Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/smarblur: add missing newline at end of verbose message

lavfi/smartblur: switch to AVOption-based system

Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* 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: Michael Niedermayer <michaelni@gmx.at>

Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/subtitles: switch to an AVOptions-based system.

lavfi/pp: switch to an AVOptions-based system.

Also add and use the '|' separator instead of ':' since it's
incompatible with the new option 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.

Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/overlay: remove dupe initializer

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

Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'

* commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319':
  vf_libopencv: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'

* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a':
  vf_hqdn3d: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'

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

Conflicts:
doc/filters.texi
libavfilter/gradfun.h
libavfilter/vf_gradfun.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'

* commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401':
  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: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

vf_curves: add option to set all curves at once

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

Merge commit 'f13ab29925883b4245da4129694af3af378d67be'

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

Conflicts:
libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'

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

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters: review introductory example and explanation

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.

lavfi/amerge: drop duplicated "Buffer queue overflow" message

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

ffmpeg: update error message, and make use of av_err2str() to simplify

Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'

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

Conflicts:
libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/blackframe: add "thres" back as alternative

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

avfilter: support alternative keys in the alternative shorthand system

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

Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'

* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
  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: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'

* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
  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: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'

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

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

Commit not merged, merge left to maintainer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'

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

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/overlay: add process_command callback

lavfi/overlay: add enable expression

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.

lavfi/overlay: add dynamic expression evaluation support

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.

lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"

The new name is more semantically and stilistically consistent.

Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'

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

Conflicts:
libavcodec/dfa.c
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavf: add libquvi demuxer.

Replace all occurrences of PRI in sscanf() calls with SCN

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

x86: sbrdsp: implement SSE2 qmf_pre_shuffle

From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.

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

lavfi/separatefields: adjust tb to avoid rounding errors.

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

avformat/avisynth: Cosmetics

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

avformat/avisynth: Fix off-by-one error in avisynth demuxer.

Fixes ticket #2412.

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

separatefields filter

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: use a rational for -aspect option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: print frame decoding error statistic

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

ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.

Fixes Ticket2405

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

h264: wait for missing slices only on frames

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: Michael Niedermayer <michaelni@gmx.at>

lavc/ass: use bprint API in ff_ass_add_rect().

ffmpeg: use a rational for -aspect option.

vf_settb: switch to an AVOptions-based system.

vf_setpts: switch to an AVOptions-based system.

vf_select: switch to an AVOptions-based system.

vf_pad: switch to an AVOptions-based system.

vf_overlay: switch to an AVOptions-based system.

vf_lut: switch to an AVOptions-based system.

vf_libopencv: switch to an AVOptions-based system.

vf_hqdn3d: switch to an AVOptions-based system.

vf_gradfun: switch to an AVOptions-based system.

vf_scale: switch to an AVOptions-based system.

vf_frei0r: switch to an AVOptions-based system.

vf_fps: switch to an AVOptions-based system.

vf_fieldorder: switch to an AVOptions-based system.

vf_fade: switch to an AVOptions-based system.

vf_drawtext: switch to an AVOptions-based system.

vf_drawbox: switch to an AVOptions-based system.

vf_delogo: switch to an AVOptions-based system.

vf_cropdetect: switch to an AVOptions-based system.

vf_crop: switch to an AVOptions-based system.

vf_boxblur: switch to an AVOptions-based system.

vf_blackframe: switch to an AVOptions-based system.

vf_aspect: switch to an AVOptions-based system.

vf_(no)format: switch to an AVOptions-based system.

af_aformat: switch to an AVOptions-based system.

buffersrc: switch to an AVOptions-based system.

af_resample: switch to an AVOptions-based system.

lavfi: switch to an AVOptions-based system.

dfa: implement missing TDLT coding method

msmpeg4: ignore negative DC overflow

Fixes second half of Ticket2414

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

msmpeg4: fix asm code in ff_msmpeg4_pred_dc()

Fixes first half of Ticket2414

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>

srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH

This was missed from 350ad50b - this fixes building the fate-srtp
test.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Increase max rtp packet size to 8192

This fixes connecting to "Ceton InfiniTV4 PCIe & USB".

Signed-off-by: Martin Storsjö <martin@martin.st>

lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify video pts calculation
  ffplay: fix indentation
  ffplay: handle audio buffersink output properly with buffering filters
  ffplay: set time_base of audio filter buffer src

Merged-by: Michael Niedermayer <michaelni@gmx.at>