* commit 'ffb0af7f':
  ac3dec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

The output is formatted to display one option per line.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '6f1ec8ed':
  avcodec.h: include version.h before using version macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Inspired by: 3a16ec19Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a16ec19':
  vf_interlace: check one av_frame_clone allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c673fc91':
  hevc_sei: drop unused parameter

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

* commit 'd234c7a0':
  mpeg4videodec: K&R formatting cosmetics

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

* commit '8769113a':
  mpeg4videoenc: K&R formatting cosmetics

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

The code does in no way depend on CONFIG_SMALL.

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

This makes the code more similar to the other optims and allows us
to use the same macros to build function names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This does not yet include any actual AVX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes a failure with probetest:
  ./tools/probetest 8192 500000
  [...]
  Failure of jacosub probing code with score=51 type=1 p=CAB size=16

Random data was:
  00000000  40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...

* qatar/master:
  configure: Don't use symlinks for creating the out of tree makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

On some platforms (such as msys), symlinks are (poorly) emulated
by simply creating a copy of the file.

This means that when building out of tree, the build tree gets
a copy of the original makefile, which can lead to unintuitive
build errors when the original makefile gets updated later.

Instead simply create a stub makefile which includes the real
one.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  mpegvideo: Fix swapping of UV planes for VCR2

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

* commit '69d4dbfd':
  aac_ac3_parser: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '37a3cac7':
  dcadec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a553c6a3':
  lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

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

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

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

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

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