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.

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/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.

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

lavfi/testsrc: remove useless args/NULL passing.

avfilter: add missing ,

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

Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'

* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
  h261: Move shared data tables from a header to a proper C file

Conflicts:
libavcodec/Makefile
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c

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

lavfi/smptebars: switch to AVOptions-based system

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

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

lavfi: replace new filter list with filters left to update.

MAINTAINERS: add opencl maintainer

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

mxfdec: update current edit unit when seeking in mxf files without index tables

Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  fate: add tests for unknown channel layouts.
  lavfi/buffersrc: update for compatibility with the fork.

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

lavfi: remove telecine libmpcodecs wrapper

Native, with more features, filter is available.

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

lavfi: remove double .priv_class initializers

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

telecine filter

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

fate: add tests for unknown channel layouts.

lavfi/buffersrc: update for compatibility with the fork.

Merge and adapt commit d28cb84 by Anton Khirnov.

lavfi/curves: introduce "all" field in presets and use it.

lavfi/curves: make possible to customize presets.

lavfi/curves: fix a spacing weirdness.

doc/opencl: speling and gramer fixes

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

opencl: add spec opencl device APIs 20130411

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

lavfi/smartblur: cleanup unused shorthand and doc.

lavfi/overlay: cleanup unused shorthand.

lavfi/field: cleanup unused shorthand and doc.

mss4: make code independent of sizeof(AVFrame)

Also fixes #2455.

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

mss4: use init_get_bits8()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: Make dsputil selectable

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h

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

Cosmetics, restore alphabetic order in atomics lists.

img2enc: add an option for overwriting one file with subsequent images

Based on a patch by Michael Niedermayer <michaelni@gmx.at>.

Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'

* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
  h264: Only initialize dsputil if error resilience is enabled

Conflicts:
libavcodec/h264.c

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

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

* ubitux/shorthand-cleanup:
  lavfi/setfield: switch to an AVOptions-based system.
  lavfi/asettb: switch to an AVOptions-based system.
  lavfi/aselect: switch to an AVOptions-based system.
  lavfi/sine: switch to an AVOptions-based system.
  lavfi/deshake: switch to an AVOptions-based system.
  lavfi/tinterlace: switch to an AVOptions-based system.
  lavfi/tile: switch to an AVOptions-based system.
  lavfi/concat: switch to an AVOptions-based system.

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

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

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

Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'

* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
  h264: Integrate clear_blocks calls with IDCT

Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm

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

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

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

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

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

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

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

Merge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'

* commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80':
  h264: Clear the mb members via memset instead of using dsputil

Conflicts:
libavcodec/h264.c

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

Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'

* commit '6d25c9db11e87ec58652de6588448225137b0c57':
  dsputil: Make square put/avg_pixels functions local to h264qpel

Conflicts:
libavcodec/dsputil.c

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

Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'

* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a
  lavfi: add a bump and docs entries for the AVOptions switch

Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h

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

Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'

* ubitux/lavfi-mixed-short-long:
  lavfi: restore mixed short/long option support with the new system.

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

Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
libavfilter/avfilter.h

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

lavfi: restore mixed short/long option support with the new system.

process_unnamed_options() is renamed to process_options() and its code
is heavily based on av_opt_set_from_string().

Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'

* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
  lavfi: make AVFilterContext export filter options.

Conflicts:
libavfilter/avfilter.c

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

Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

* commit '62549f9655c48f0ec061087fa33a96040ce01145':
  lavfi: error out when options are provided to a filter that does not take any

Conflicts:
libavfilter/avfilter.c

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

Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'

* commit 'c43a7ecad997fc527af34b952334f3d030709a1b':
  lavfi: remove now unused args parameter from AVFilter.init

Conflicts:
libavfilter/avfilter.c
libavfilter/buffersrc.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_alphamerge.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c

Not merged (yet) because there are still many filters that use the args
parameter.

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

Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'

* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
  vsrc_testsrc: switch to an AVOptions-based system.

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

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

avutil/opencl: add opencl device list APIs 20130411

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

Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
  vsrc_movie: switch to an AVOptions-based system.

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

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

Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

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

Conflicts:
libavfilter/vsrc_nullsrc.c

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

Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'

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

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

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

Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'

* commit '73d5d405d424c06f3f354337cfdb24794932094d':
  split: switch to an AVOptions-based system.

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

Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'

* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
  af_volume: switch to an AVOptions-based system.

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

Move misplaced file author information where it belongs

Merge remote-tracking branch 'richardpl/biquads'

* richardpl/biquads:
  lavfi/biquads: switch to an AVOptions-based system

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

Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'

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

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

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

lavfi/biquads: switch to an AVOptions-based system

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

Merge remote-tracking branch 'richardpl/framestep'

* richardpl/framestep:
  lavfi/framestep: remove request_frame hack
  lavfi/framestep: switch to an AVOptions-based system

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

lavfi/framestep: remove request_frame hack

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

lavfi/framestep: switch to an AVOptions-based system

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

Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'

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

Conflicts:
libavfilter/af_channelsplit.c

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