* commit '5a4e9fe8':
  avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
  shorten: use the unsigned type where needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4c364eb2':
  shorten: report meaningful errors

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

* commit 'a2ad554d':
  shorten: K&R formatting cosmetics

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

* commit 'c10da30d':
  shorten: set invalid channels count to 0
  vorbisdec: check memory allocations
  h264: check for luma and chroma bit dept being equal

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

- check ret < 0
- remove excessive error log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These are widely used throughout libavcodec, nothing dsputil-specific.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Address trac ticket #2319.

This fixes a regression caused by changes to the buffer initialization code.
Fixes valgrind warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice

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

* cehoyos/master:
  Move the iconv test to the bottom of configure.
  Make 32bit zmbv colour-space opaque.
  Use uint8_t instead of uint16_t pointer in kega decoder.
  kgv1dec: Simplify kega decoding by using memcpy instead of loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Someone should rename the variables, theres nothing random in there
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes invalid memcpy and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

get_uint returns an unsigned value, use an unsigned to store
blocksize to make sure the comparison logic is correct and report
correctly the error for the channel count not supported.

Prevent the loop shorten_decode_close from writing and freeing out of
the array boundary.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This fixes a possible mis-detection of iconv on OS X.
OS X with macports often has two version of libiconv.2.dylib
installed, one with symbols like "_iconv_open" and one with
"_libiconv_open", so test for iconv with all flags to make
sure the detection uses the same library as the actual
compilation / linking.

Tested-by: Paul Sturbaum

This change allows to remove a few casts and avoids
a potential pointer aliasing violation.

Fixes decoding errors with icc 13.1
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

It should be easy to add support but without a sample we would
not know if they work.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes use of uninitialized variables and possible out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The decoder assumes a single bit depth for all the planes
while the specification allows different bit depths for luma
and chroma.

Avoid the possible problems described in CVE-2013-2277

CC: libav-stable@libav.org

Create dedicated subsection and itemize. Not done for every filters, but
a large part is done.

Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.

The filter has been natively integrated into libavfilter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>