This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
Reviewed-by: NMarton Balint <cus@passwd.hu>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4e03b209':
  mpeg12: Always invoke the get_format() callback

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

* commit 'ce423163':
  h264: Always invoke the get_format() callback

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

* commit '1c80c9d7':
  hwaccel: Call ->get_format again if hwaccel init fails

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

* 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: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

Conflicts:
	libavformat/format.c

See: bcac0f40Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

ff_all_channel_layouts() might return null on alloc failure.

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

ff_all_channel_layouts() might return null on alloc failure.

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

ff_all_channel_layouts() might return null on alloc failure.

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

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

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

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

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

Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

This allows the application to fall back on another hwaccel or,
more likely, software decoding.
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

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: NLuca Barbato <lu_zero@gentoo.org>

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

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

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

Signed-off-by: NDiego 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: NMichael Niedermayer <michaelni@gmx.at>
Signed-off-by: NTim Walker <tdskywalker@gmail.com>

This appears to be the intended behavior.

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

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

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

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

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

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