* commit '317cfaa5':
  asfdec: prevent the memory leak in the asf_read_metada_obj
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '58c3720a':
  fate: Make sure a corner-case for ASF is covered

Adjusted fate ref to match the different timebase of the ffasf demuxer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '72839fce':
  hlsenc: Use AV_TIME_BASE units for all the computations

Not merged, duration/time computation is handled quite differently in ffmpeg's hlsenc
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7bf96472':
  vp7: bound checking in vp7_decode_frame_header

Only partially merged, see 46f72ea5Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f34b152e':
  libfdk-aacdec: Clean up properly if the init fails
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1b90433f':
  libfdk-aacdec: Always decode into an intermediate buffer

Conflicts:
	libavcodec/libfdk-aacdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '87de6ddb':
  libfdk-aacdec: Bump the max number of channels to 8
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cb2dbe2c':
  configure: arm: Assume softfp ABI on darwin
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '44b44441':
  x86inc: Various minor backports from x264
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '26ac22e5':
  movenc: Add a new flag for writing global sidx indexes for dash

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Process more lines in a single pass to improve performance
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

+ split color conversion from scaling
- disabled gamma correction, until it's refactored too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This improves results after FF_API_LAVF_BITEXACT=0. It still doesn't
pass, because of mov rtphint track which I don't understand (yet).

They picked up defaults, which changes from 128 to 200 when we remove
FF_API_OLD_AVOPTIONS.

Fixes associated fate tests when FF_API_MV0=0.

This filter can be used to scale one stream to match another or based on
another, useful to scale subtitles or other things to be overlayed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket #4772.

Found-by: Pedro Arthur <bygrandao@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes part of Ticket1388
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The h264 decoder reports 4.1 as its maximum level, but it will decode
5.1 4K video just fine. In practice, the published level limits in
vdpau do not communicate anything that's actually useful.

Use sizeof(void *) as its value, because AVFilterBufferRef is deprecated.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

also do not return the error code but just break reading
metadata object in the case of the aspect ratio reading failure
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Test the demuxer for the case when the replicated data length in
a sample is 0.

Sample-ID: https://samples.libav.org/mplayer-bugs/bug821/bug821-2.asfSigned-off-by: Luca Barbato <lu_zero@gentoo.org>

Do not risk mixing different timebases.

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

CC: libav-stable@libav.org

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Similar to the pixel format code

Fixes Ticket3847
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes https://trac.ffmpeg.org/ticket/4776Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Previously most of the error paths leaked.

Also add FF_CODEC_CAP_INIT_THREADSAFE while adding caps_internal;
this decoder wrapper doesn't have any static data that is initialized.
Signed-off-by: Martin Storsjö <martin@martin.st>

For ADTS streams, the output format (number of channels, frame size)
can change at any point (with the latest version of fdk-aac, the decoder
seems to change format after a handful of frames, not outputting the
right format immediately, for cases that worked fine with the earlier
version of the lib).

Previously, the decoder decoded straight into the output frame once the
number of channels and frame size was known. This obviously does not
work if the number of channels or frame size changes.

The alternative would be to allocate the AVFrame with the maximum number
of channels and frame size, and change them afterward decoding into it,
but that may cause confusion to users e.g. of the get_buffer callback.
This solution should be more robust.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

In the latest version of fdk-aac, the decoder can output up to 8
channels; take this into account when preallocating buffers that
need to fit the output from any packet.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

Don't try to detect the float ABI by checking at the toolchain
name or by trying to assemble and link files with eabi_attributes.

This fixes the float ABI detection when building using clang
with -fembed-bitcode, where the current eabi_attributes check
accidentally passes.

This issue was pointed out by James Howe <james.howe@hp.com>.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes Ticket4744 part3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes Ticket4744 part2
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket4744 part1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes assertion failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>