* commit '9eef9eb3':
  h264: check that execute_decode_slices() is not called too many times

Conflicts:
	libavcodec/h264.c

The check is replaced by an assert() as the mb index should not ever go out
of bounds.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bfd26b7c':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
	libavcodec/h264_ps.c

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

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

* commit '9a026c72':
  h264: rebuild the default ref list if the reference count changes

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

* commit '4736d003':
  cavsdec: check ff_get_buffer() return value

Conflicts:
	libavcodec/cavsdec.c

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

* commit '50079a6a':
  lavc: do not leak the internal frame if opening the codec fails

Conflicts:
	libavcodec/utils.c

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

* commit '3867f371':
  lavf: remove a pointless check

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

* commit '75647dea':
  oggparseogm: check timing variables

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

* commit '8058284c':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
	libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f970946':
  lagarith: do not call simd functions on unaligned lines

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

* commit 'f4a8a008':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
	libavcodec/sgidec.c

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

* commit 'adb199d1':
  kgv1dec: replace forcing EMU_EDGE by a copy

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

* commit 'fe80fa53':
  4xm: replace forcing EMU_EDGE by a copy

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

* commit 'fffca3d2':
  4xm: return a proper error code.

Conflicts:
	libavcodec/4xm.c

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

* commit '06066719':
  hevc: rename some HEVC conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98c0cd0b':
  hevc: add new conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

There is no point in delaying the check and it avoids bugs with a
half-initialized context.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

AVStream.codec is always non-NULL

Fixes a potential divide by zero.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Aligns frame dimensions to 16, which fixes potential invalid writes.

They end up overwriting past the line end.

Partially based on a patch by Michael Niedermayer <michaelni@gmx.at>

Bug-Id: vlc/9700
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Right now it will spuriously fail if the linesize is exactly equal to
the data width.

CC:libav-stable@libav.org

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

Some HEVC conformance streams zip on
http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/
were updated without changing the actual stream. Rename them in FATE
accordingly to make it easier to track future stream updates.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Also remove superseded conformance streams. The conformance streams all
come from http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes qp fields becoming out of range
Fixes: asan_static-oob_e393a3_6998_WPP_A_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This matches how its done for SPS/PPS.
An alternative to this is to check it when its used.

Fixes null pointer dereference
Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  cmdutils: update copyright year to 2014.

Conflicts:
	cmdutils.c

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

* commit '7840c404':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '13345fc1':
  (e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e9212309':
  mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>