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>

Compared to existing, common opensource H264 encoders, this can be
useful since it has got a different license (BSD instead of GPL).

Performance- and qualitywise it is comparable to x264 in ultrafast
mode.

Hooking it up as an encoder in libavcodec also simplifies comparing
it against other common encoders.

This requires OpenH264 1.3 or newer. Since the OpenH264 API and ABI
changes frequently, only releases are supported.

To take advantage of the OpenH264 patent offer, the OpenH264 library
must not be redistributed, but downloaded at runtime at the end-user's
system.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

As referenced in the CoreMedia API docs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Bug-Id: CID 1257781

This is the order that the caller uses in the rest of the file.
Variables are modified to reflect the order above too and their
initialization is merged with their declarationt. No behavioral
change.

Bug-Id: CID 732286

I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.
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>

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>

The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.

Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.
Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Under abnormal conditions the item_count may exceed the max
allocation size on 32-bit systems, this causes the allocated
size to overflow and become too small for the given count.

Additionally, if av_reallocp() fails its allocation, the
fragment_index_count is not correctly decremented.

Ensuring further havoc may be wrought, the error code for
read_tfra() is not checked upon return.
Found-by: Paul Mehta <paul@paulmehta.com>

positive return code and use of _array functions by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>