* commit 'cc4992aa':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4c2fd4b2':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b39ebcdd':
  fate: Add VC-1 interlaced twomv test

Note, this test is not free of artifacts on both sides of the merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a97328af':
  vc1: Use logical instead of bitwise or for twomv

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

* commit 'b5fe1344':
  vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This is actually defined in the A/52 specification.

Some encoders already use this value even
though it's reserved in the A/52 specification.

CC: libav-stable@libav.org

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>

This appears to be the intended behavior.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b97f6ef9':
  pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d5b99da':
  caf: Give context structure a consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This avoids an unused variable warning on big-endian systems.

Fixes Ticket #3935.

Signed-off-by: Clément Bœsch <u@pkh.me>

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

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

lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.

Based on a patch by Marius Cirsta.

Fixes ticket #2016.

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

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

It may be used by ff_add_pixels_clamped_sse2().
Should fix fate-cavs failures on some systems.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.

Bug found by: Jonas Geistert <j.geistert@yahoo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

* commit '4620affa':
  m4vdec: K&R formatting cosmetics

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

* commit '86a36108':
  lmlm4: K&R formatting cosmetics

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

* commit '95d312d6':
  concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28f5cd31':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
	tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd07ddc93':
  avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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