h261: Move encoder/decoder shared table init to common code
lavc: extend / update the [coded_]{width,height} doxy
lavc: don't overwrite display dimensions with coded dimensions.
Move misplaced file author information where it belongs
lavfi/testsrc: remove useless args/NULL passing.
lavfi/sendcmd: switch to an AVOptions-based system.
lavfi/blackdetect: switch to an AVOptions-based system.
Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/astreamsync: fix eval memleak.
lavfi/astreamsync: switch to an AVOptions-based system.
lavfi/blend: support more yuv pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavfi: remove bbox from the filters left to update.

The filter doesn't take any option and thus works with the new system.
lavfi/anullsrc: switch to an AVOptions-based system.
lavfi/asetnsamples: switch to an AVOptions-based system.
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: add pp to the ':'-to-'|' compat layer.
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/bbox: remove unused variables and functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
cmdutils: add opencl command line options to ffmpeg

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