avconv: use current syntax for the scale filter
af_asyncts: fix offset calculation

delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.

CC:libav-stable@libav.org
x86: sbrdsp: implement SSE2 qmf_pre_shuffle

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
indeo3: avoid writes without necessary alignment in copy_cell()

Cells starting at a position aligned to 8 pixels but wider than
4 blocks are copied with 3 blocks per loop. This creates problems on the
next loop iterations since the routine copying 2 blocks requires the
same alignment on some architectures like ARM NEON.
ADPCM DTK decoder

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

Signed-off-by: James Almer <jamrial@gmail.com>
adpcm_thp: Allow the use of extradata for the adpcm table

There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.

This change will make it easier to implement demuxers for said containers
without having to create a new decoder.

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

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

Signed-off-by: James Almer <jamrial@gmail.com>
ADPCM IMA Radical decoder

Signed-off-by: James Almer <jamrial@gmail.com>
Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
  avconv: use current syntax for the scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'

* commit '16a4a18db089af8c432f1cdec62155000585b72c':
  af_asyncts: fix offset calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'

* commit '2c299d4165cd9653153e12270971c2368551b79e':
  x86: sbrdsp: implement SSE2 qmf_pre_shuffle

Conflicts:
	libavcodec/x86/sbrdsp.asm
	libavcodec/x86/sbrdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: avoid writes without necessary alignment in copy_cell()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/curves: avoid ctx pointer indirection.
doc/filters: sort audio filters by name
doc/filters: remove duplicated abuffer docs
vf_copy: silence "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_mp: remove unused function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_astats: fix 64bit printf type

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