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: Lou Logan <lou@lrcd.com>

Attemtping to decode them could lead to invalid writes with some fuzzed
samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5a1addd7':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

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

* commit '01168bf1':
  mpeg: Remove unused field
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'b3f04657':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.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: Michael Niedermayer <michaelni@gmx.at>

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

These have a DXSA tag and contain alpha in addition to
color values for palette.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec/mpeg12: Try to fetch pts/dts from both the packet associated with the picture start code as well as earlier start codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.

CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com

This will be needed for the following timestamp fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '8a3d9ca6':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
	Changelog
	configure
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2a1500fb':
  movenc: Fix a typo in a comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e581e88c':
  movenc: Readd an accidentally removed condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8e03ca2f':
  isom: add 'mp1v' fourcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1c618323':
  msmpeg4: check memory allocations and propagate errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed97963b':
  ulti: invert the order of parameters of ulti_decode_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4438c256':
  vf_interlace: remove the warning tag in the message
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '15ea2227':
  vf_interlace: merge FIELD_LOWER check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '046f75a9':
  vf_interlace: also assert for height
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e8Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '696141e8':
  vf_interlace: use image width rather than linesize

Conflicts:
	libavfilter/vf_interlace.c

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

* commit 'fe082998':
  build: Use -Werror=format-security

Conflicts:
	configure

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

* commit '2cef68da':
  vda: error out if decoded CVPixelBuffer is empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '0352ff10':
  ffv1: const correctness for encode_rgb_frame()

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

* commit 'ca09effb':
  ffv1: Drop unnecessary casts and const qualifiers to match function signatures

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

* commit '1dd797e3':
  swscale: check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '07a0c0f0':
  opt: check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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