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

Conflicts:
	libavcodec/x86/sbrdsp.asm
	libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16a4a18d':
  af_asyncts: fix offset calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '72fbc968':
  avconv: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

clang did not show this one, so i missed it in the last batch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This should fix several issues with odd dimensions inputs.

lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.

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

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

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mmf: K&R formatting cosmetics

Conflicts:
	libavformat/mmf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

CC:libav-stable@libav.org

Fixes access after free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Makes decoding little faster.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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

This is about 6 times faster than md5sum on linux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6e9f8d6a':
  x86: vf_yadif: Remove stray dsputil_mmx #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3d40c1ee':
  x86: dsputil: Move TRANSPOSE4 macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '71469f3b':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed880050':
  x86: dsputil: Group all assembly constants together in constants.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '87614667':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
	libavcodec/x86/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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