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

cmp{p,s}{s,d} instructions do take an imm8 operand.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
dsputil: Make square put/avg_pixels functions local to h264qpel

Put a copy of the 8bit functions only in dsputil, where they are
used for some other things (e.g. mpeg4qpel, mspel, cavsqpel).

Signed-off-by: Martin Storsjö <martin@martin.st>
h264: Clear the mb members via memset instead of using dsputil

Signed-off-by: Martin Storsjö <martin@martin.st>
h264: Integrate clear_blocks calls with IDCT

The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700
to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb
(in the decode_slice loop) goes from 1759 to 1733 cycles on the clip
tested (cathedral), i.e. almost 30 cycles per mb faster.

Signed-off-by: Martin Storsjö <martin@martin.st>
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 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 '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>
lavfi/concat: switch to an AVOptions-based system.
lavfi/tile: switch to an AVOptions-based system.
lavfi/tinterlace: switch to an AVOptions-based system.
lavfi/deshake: switch to an AVOptions-based system.
lavfi/sine: switch to an AVOptions-based system.
lavfi/aselect: 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/asettb: switch to an AVOptions-based system.
lavfi/setfield: switch to an AVOptions-based system.
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>