* commit '9d2cee52':
  configure: Assume a standard-compliant default libc

See: 170e2fd7
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and 170e2fd7
could then be reverted)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6cfbe1de':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

About two times faster than the c wrapper.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '883e98bc':
  probe: Bump the score for mime type matching

Conflicts:
	libavformat/format.c

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

* commit 'd995f0a1':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
	libavutil/log.c

No change, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

* commit '7703995a':
  flac: Remove unused headers

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

* 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>

Non-standard compliant libc should be supported on a per-case basis
anyway.

Data and subtitle streams might cause false positive.

It should be more trustworthy than extension matching.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* 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>

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

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>