* commit '061c4898':
  eamad: check for out of bounds read

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

* commit '161442ff':
  mdec: check for out of bounds read
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe208ca5':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

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

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

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>

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

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

Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '35c6ce76':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '36a6fb98':
  hevc_deblock: Fix compilation with nasm

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

* commit 'e570f895':
  libschroedinger: Check memory allocations

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

* commit '521979e6':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

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

* commit 'f7cc6627':
  configure: Use pkg-config for libdc1394 discovery
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This also fixes a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Averaging over 2 pixels doesn't work correctly for the last pixel, because the
rest of the buffer is not initialized.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes the use of uninitialized values in avpriv_do_elbg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes invalid reads of the packet buffer in av_dup_packet

Based on patch by Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes freeing the frame buffer twice on cleanup leading to a crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a388e72d':
  rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e2220e73':
  rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c99915f7':
  rtpdec: DV depacketizer (RFC 6469)

Conflicts:
	Changelog
	libavformat/Makefile
	libavformat/rtpdec_dv.c
	libavformat/version.h

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

Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

CC: libav-stable@libav.org
Bug-Id: 795
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Since not all systems need the libraw1394 dependency, let pkg-config
provide the list of libraries actually needed.

The libdc1394-2.pc file has been included since version 2 (2008-01-05),
so it should be safe to use.

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

Fixes out of array read
Fixes CID1257803, CID1257797, CID1257789, CID1257786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

(tested with live555 RTSP server)
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes CID1258478, CID1258476, CID1258475
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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