Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'

* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
  lavfi: mark filters with dynamic number of inputs or outputs with special flags

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

Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'

* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
  lavfi: add avfilter_init_dict() for initializing a filter with a dict.

Conflicts:
libavfilter/avfilter.c

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

lavfi: fix forgotten chunk in eb0f774d.

avfilter: remove opaque passing hacks

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

buffersink: switch from opaque to AVOptions for params

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

abuffersink: switch from opaque to AVOptions for params

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

lavfi/ocv: fix crash with no dilate arguments.

lavfi/ocv: fix crash with no filter name specified.

lavfi/ocv: fix build after fd6228e65.

buffersink: remove shorthand

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

avfilter: remove mixed args hack for scale.

Our option handling code does not need this hack.

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

ffmpeg: use options for abuffersink.

Also remove unused buffersink_params.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/buffersink: accept parameters as options.

Move validation from init to query_formats().
Accept the formats lists as binary options.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu: add helper functions for integer lists.

Add av_int_list_length() to compute a list length.
Add av_opt_set_int_list() to set a binary option.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/asrc_aevalsrc: fix return code, 2nd try

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

lavfi: remove now unused args parameter from AVFilter.init and init_opaque

This is mostly automated global search and replace

The deprecated aconvert filter is disabled, if it still has users
it should be updated

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

lavfi: remove now unused args parameter from AVFilter.init

Conflicts:

libavfilter/avfilter.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vsrc_color.c
libavfilter/vsrc_movie.c

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

avfilter/asrc_aevalsrc: check correct variable

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

doc/filters: update volume options description.

doc/filters: add quick emboss example

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

avfilter: remove old shorthand system

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

doc/cropdetect: update boxblur options description.

doc/crop: update boxblur options description.

doc/filters: update boxblur options description.

doc/filters: update blackframe options description.

af_pan: avoid spaces before % to avoid possible issues with MSVC

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

af_pan: switch to an AVOptions-based shorthand system.

TODO: The first argument can be seperated into its own AVOption

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

af_pan: fix parsing arguments from the example in the documentation

pan=stereo: FL < FL + 0.5*FC + 0.6*BL + 0.6*SL : FR < FR + 0.5*FC +
0.6*BR + 0.6*SR

didn't actually work ('Expected out channel name, got " FL < FL"')

abuffer: switch to an AVOptions-based shorthand system.

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

buffersrc: switch to an AVOptions-based shorthand system.

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

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

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter: Update scale to dictionary based options

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

Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'

* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
  lavfi: add avfilter_init_str() to replace avfilter_init_filter().

avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed

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

Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'

* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

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

Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
libavfilter/avfilter.h

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

Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'

* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
  lavfi: deprecate avfilter_graph_add_filter().

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

Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'

* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

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

lavfi/overlay: improve feedback in case of invalid expression

Based on vf_hue.c code.

doc/filters: rework Commands section for overlay filter

doc/filters: apply minor fixes to hue Commands section

lavfi/overlay: fix crash in case of invalid expression

lavfi/overlay: add repeatlast option

lavfi/overlay: reindent constants in option list

Wanted-By: ubitux

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c

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

doc/filters: use -af and -filter_complex instead of amovie for two examples.

Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'

* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
  lavfi: add const to the pads parameter of avfilter_pad_get_name/type
  lavfi: add const to AVFilterContext.filter.

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

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

doc/encoders: Clarify that there are 2 prores encoders

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

avcodec: rename prores encoders

Using the first names of authors sounds somewhat unprofessional
and might be considered offensive which is not intended.
The new names use the initials of the authors due to simplicity
and the possibility to apply it consistently without the need
to find political correct names for each future case where
alternative codecs might exist. Also its shorter ...

If someone has a better idea, like maybe 2 random letters
and people prefer it then iam happy to switch to that ...

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

doc/filters: fix fade-out hue saturation expression in sendcmd example

doc/filters: update hue command syntax after recent update

lavfi/aspect: fix d2q convert in init.

Regression since git 71ef1ec7b.

Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'

* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

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

Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'

* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
  Cosmetics, restore alphabetic order in atomics lists.

Conflicts:
libavutil/Makefile

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

lavfi: deprecate aconvert.

This filter is not required anymore with aformat. Drop it at next bump.

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

This is heavily based on 2831b307 by Anton Khirnov <anton@khirnov.net>

Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'

* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
doc/muxers.texi
libavformat/img2enc.c

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

lavfi/flite: switch to AVOption-based system

lavfi/hue: extend debugging message

In particular, show h value in degrees.

lavfi/hue: reindent after last commit

lavfi/hue: apply major simplifications, and switch to AVOption-based system

This also drops support for "flat syntax" and "reinit" command.

"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.

*This is a syntax break*.

lavfi/ebur128: remove now unused av_opt_free call.

lavfi: mark filters with dynamic number of inputs or outputs with special flags

This will be useful in avtools in the following commits.
Any other caller might also want to know this information.

avfilter/aresample: use init_dict system and set child AVOption context correctly

Parts of this commit are based on: 4fa1f52e

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

avfilter: fix handing of child context options

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

lavfi: add avfilter_init_dict() for initializing a filter with a dict.

lavfi: add avfilter_init_str() to replace avfilter_init_filter().

Drop the unused opaque parameter from its signature.

lavfi: make avfilter_free() remove the filter from its graph.

lavfi: add AVFilterContext.graph.

It will be useful in the following commits.

lavfi: deprecate avfilter_graph_add_filter().

Since this function adds a standalone filter to a filter graph and we do
not support creating such filters, there is no reason for this function
to exist.

lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Since we do not support "standalone" filters not attached to an
AVFilterGraph, we should not have a public function to create such
filters. In addition that function is horribly named, the action it does
cannot be possibly described as "opening" a filter.

lavfi: merge avfiltergraph.h into avfilter.h

We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.

lavfi: add const to the pads parameter of avfilter_pad_get_name/type

lavfi: add const to AVFilterContext.filter.

lavfi should never modify the filter through that pointer.

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

avienc: fix overflow of audio sample count

Fixes an overflow of the sample count field within the audio stream header
chunk if audio stream data exceeds 2GB.

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

avfilter/f_select: use AVFrame metadata accessor function

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

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

ffmpeg: insert format filter with the appropriate separator.

Similar to 937325f3.

lavfi: do not warn inappropriately with aevalsrc.

ffmpeg: insert aformat filter with the appropriate separator.

The ',' separator is deprecated with aformat, and thus causes various
arnings when transcoding audio.

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

Fix compilation with --disable-everything --enable-filter=deshake

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/avisynth: Don't insert null frames or samples at the start of a stream.

This is the last remaining issue from ticket #2412

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

libshine fixed point MP3 encoding support

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

cmdutils_common_opts: fix indention of #if

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

cmdutils: remove unneeded #if

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

cmdutils: add opencl command line options to ffmpeg

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

lavfi/bbox: remove unused variables and functions

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c

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

lavfi: add pp to the ':'-to-'|' compat layer.

Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'

* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres

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

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

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

lavfi: remove bbox from the filters left to update.

The filter doesn't take any option and thus works with the new system.

lavfi/blend: support more yuv pixel formats

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

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

lavfi/astreamsync: fix eval memleak.

Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'

* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
  h261: Move encoder/decoder shared table init to common code

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

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