* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
	libavformat/utils.c

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

* commit '7ee191ca':
  dv: Add a guard to not overread the ppcm array

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

* commit '85ac1258':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

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

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

Some fields of the frame are changed to reflect encoder decissions like
if its a keyframe. It thus cannot be constant.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Unbreak xyz12 with vflip.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Put it inside its own ifdef conditional.
Signed-off-by: James Almer <jamrial@gmail.com>
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>

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

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

CC: libav-stable@libav.org

if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

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

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

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

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

bits_per_coded_sample should be set from demuxer and
not from decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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

* qatar/master:
  avisynth: K&R formatting cosmetics

Conflicts:
	libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '97b052e5':
  avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'befe044b':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
	libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7f93a861':
  mpeg12enc: K&R formatting cosmetics

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

* commit '66f09105':
  mpeg12enc: drop forward declarations

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

* commit 'c3e6e8f0':
  mem: Do not check unsigned values for negative size

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

* commit 'b634b36f':
  mem: Improve documentation wording and spelling

Conflicts:
	libavutil/mem.c
	libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>