* commit '0d378439':
  rtmpproto: Check for the right return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8411baf6':
  dca_parser: Handle changes in DCA frame size

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

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

* commit '18a245a2':
  jpeg2000dec: Add more checks when parsing headers

The check cannot be true in FFmpeg, but does no harm.
I will move it in a subsequent commit so it can detect missing SIZ
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

With some (buggy) drivers, the VIDIOC_G_STD ioctl returns a std_id that cannot
be matched with any of the enumerated v4l2_standard structures (for example
std_id = 0 or std_id = 0xffffff). Do not fail when we reach the end of the
enumeration without a valid match.

Fixes ticket #2370

Note: This commit message has been modified by Giorgio Vazzana, the original
commit message was:

"Fixed regression for mandatory VIDIOC_ENUMSTD support by v4l2"
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: Michael Niedermayer <michaelni@gmx.at>

Approved-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Contains text suggested by carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It's introduced by the erroneous merging commit cbe47b1e.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

A change in framesize caused a perpetual loss of synchronization.
So read (and use) the frame size from the frame header instead of
setting it only once.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

It's not our responsibility to account for other projects'
terrible hacky usage.

Also, it is no longer needed by XMBC, since 78b71d4.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Previously this would have lead to a memcpy(a,a) which violates the
requirement of non overlapping src and dst.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  doc: Add missing hashes and dates to APIChanges

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1db3315':
  ffv1: Make sure at least one slice context is initialized

Conflicts:
	libavcodec/ffv1.c

This condition is not possible in ffmpegs ffv1 code and already
checked for by assert() for the case that some future changes make it possible.
Thus merge just for meta-data
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ea78a348':
  eacmv: Make sure a reference frame exists before referencing it

Conflicts:
	libavcodec/eacmv.c

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

* commit 'c39f7eba':
  truemotion2: Use av_freep properly in an error path

Conflicts:
	libavcodec/truemotion2.c

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

* commit 'f875a732':
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:
	libavcodec/mpeg4videodec.c

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

* commit 'a92538b7':
  ivi_common: Make sure color planes have been initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7f8d41eb':
  mov: Don't use a negative duration for setting other fields

Conflicts:
	libavformat/mov.c

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

Since the errors are not fatal, it is less confusing not to show them as
errors but as warnings.

Arbitrarily fixes trac ticket #2419.

* commit '19b9659f':
  oggparseogm: Convert to use bytestream2

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

* commit '711c9701':
  rv34: Check the return value from ff_rv34_decode_init

Conflicts:
	libavcodec/rv30.c
	libavcodec/rv40.c

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

* commit '569d18aa':
  matroskadec: Verify realaudio codec parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1f3847f':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
	libavcodec/mace.c

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

* commit '1115689d':
  svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Conflicts:
	libavcodec/svq3.c

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

Also fix the typo in the last entry version.

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

* qatar/master:
  rtmp: rename main_channel_id to stream_id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4aef997':
  rtmp: Follow Flash player numbering for channels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '120af23c':
  rtmp: Send video on a separate channel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '68b46774':
  lavf: Make probe_codec return an error code

Conflicts:
	libavformat/utils.c

A failure to reallocate should not free the array as it is used
to probe the codec. And failure to reallocate if the following
probe succeeds isnt a fatal error for probe_codec(). Thus this
is only partially merged to ensure probing still is attempted
with the data available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>