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

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

* qatar/master:
  movenchint: Clear size and len if the realloc failed

Conflicts:
	libavformat/movenchint.c

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

* commit 'f2b00a53':
  movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '23d6ba2c':
  vc1dec: Check the error handling flags on slice/field header decode errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7e61695':
  electronicarts: Check packet sizes before reading

Conflicts:
	libavformat/electronicarts.c

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

* commit 'ce67f442':
  lavf: Avoid setting avg_frame_rate if delta_dts is negative

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

Fix warning:
ffprobe.c:1684:21: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized] end = start + interval->end;

The warning is a false positive, since the variable is accessed only if
has_start is set, and in that case start has been already set.

* commit 'bb7bf175':
  vc1dec: Don't decode slices when the latest slice header failed to decode

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

* commit '5e25fdbf':
  vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks

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

* commit 'b772b0e2':
  vc1dec: Undo mpegvideo initialization if unable to allocate tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ede50844':
  vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91be1103':
  wnv1: Make sure the input packet is large enough

Conflicts:
	libavcodec/wnv1.c

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

* commit 'f1eac2b8':
  movenc: Use keyframes as default fragmentation point in ismv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9553bbb':
  movenc: Set all implicit flags immediately in mov_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '187023f6':
  movenc: Set mov->mode earlier in mov_write_header

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

* commit '50550356':
  tls: Do not abort on non-fatal TLS alerts with gnutls
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c951e4b4':
  flv: Make onTextData parsing robust
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ba77757a':
  rtmp: Replace a magic number with a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58404738':
  rtmp: Rewrite embedded flv handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e40a0e82':
  rtmp: Refactor get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '32a414f3':
  rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Remove can_safely_read() as its not really needed with
checked bitstream reader.

Fixes #2984.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Simplify.

Fix typos, and clarify note about codec AVOptions.

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

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>

Previously these were left in an inconsistent state.

Pointed out by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

This avoids setting avg_frame_rate to invalid (negative)
values.

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

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

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

Previously, s->context_initialized was left set to 1
if ff_vc1_decode_init_alloc_tables failed, skipping the
initialization completely on the next decode call.

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

lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>