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

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lou Logan <lou@lrcd.com>

* commit '22b985d5':
  hqdn3d: check memory allocations and propagate errors

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

* commit '70d246d5':
  flacenc: initialize sums matrix

Conflicts:
	libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c01ccccb':
  ituh263dec: use macro instead of #if
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '08fa34bf':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
	libavformat/yuv4mpegdec.c

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

* commit '302ca6b2':
  mpegvideo_enc: initialize the encoding context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1a07df31':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

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

* commit '598f7d04':
  DNxHD: Simplify pixel format detection

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

* commit '41e03e28':
  DNxHD: More verbose error messages

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

* commit '1279221c':
  lavu: Check av_dict_set allocations

Conflicts:
	libavutil/dict.c

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

CC: libav-stable@libav.org
Bug-Id: CID 703821

CC: libav-stable@libav.org
Bug-Id: CID 1265721

This prevents several uninitialized variable uses that take
place towards the end of encoding.

CC: libav-stable@libav.org
Bug-Id: CID 700760

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Error out in case of unknown values.

Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6996fd20':
  libopenh264: Log debug messages to a non-null context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.

Signed-off-by: Martin Storsjö <martin@martin.st>

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

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de

* commit '61928b68':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

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

This undoes the effect of 3c18a7b1 for reading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3c18a7b1':
  avio: Do not consider the end-of-buffer position valid

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

* commit '6a808f5a':
  libdc1394: Add support for MONO8 (gray) video mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Check of channels !=0 is right above.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Fixes crash with odd widths
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: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org