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

* commit 'b01a2204':
  libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

Conflicts:
	libavcodec/libfdk-aacdec.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next
tag to try to choose between the two.

Fixes ticket #4003
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'e65c776d':
  rtmpproto: Add getStreamLength call to query duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '324b23dd':
  rtmpproto: Add function to read a number response
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '47e3e109':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

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

The FDK decoder is capable of producing mono and stereo downmix from
multichannel streams. These streams may contain metadata that control
the downmix process. The decoder requires an Ancillary Buffer in order to
correctly apply downmix in streams containing downmix Metadata. The
decoder does not have an API interface to inform of the presence of
Metadata in the stream, and therefore the Ancillary Buffer is always
allocated whenever a downmix is requested.

When downmixing multichannel streams, the decoder requires the output
buffer in aacDecoder_DecodeFrame call to be of fixed size in order to
hold the actual number of channels contained in the stream. For example,
for a 5.1ch to stereo downmix, the decoder requires that the output buffer
is allocated for 6 channels, regardless of the fact that the output is in
fact two channels.

Due to this requirement, the output buffer is allocated for the maximum
output buffer size in case a downmix is requested (and also during
decoder init). When a downmix is requested, the buffer used for output
during init will also be used for the entire duration the decoder is open.
Otherwise, the initial decoder output buffer is freed and the decoder
decodes straight into the output AVFrame.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '0db6bbb2':
  avformat: Make avformat_free_context handle NULL

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

* commit 'c92965db':
  avconv: check return value

Conflicts:
	ffmpeg.c

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

* commit 'c802a2e7':
  avconv: fix leak in filter error

Conflicts:
	ffmpeg_filter.c

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

* commit 'aeb23fc4':
  avprobe: Remove a pointless check

Conflicts:
	avprobe.c

No change as the code does not exist in ffprobe
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e58a140c':
  avplay: Always free opts

Conflicts:
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cf83c017':
  avplay: Always free find_stream_info options

Conflicts:
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'f29c226a':
  fate: add mpeg4 tests for frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This will be needed for the resolution change mpeg4 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.
Signed-off-by: Martin Storsjö <martin@martin.st>

Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.
Signed-off-by: Martin Storsjö <martin@martin.st>

The OptionDef arrays are terminated with a { NULL } element not NULL.

CC: libav-stable@libav.org
Bug-Id: CID 703769

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org

CC: libav-stable@libav.org
Bug-Id: CID 1224275

CC: libav-stable@libav.org
Bug-Id: CID 1005311

The element is always valid.

CC: libav-stable@libav.org
Bug-Id: CID 732276

CC: libav-stable@libav.org
Bug-Id: CID 733793

CC: libav-stable@libav.org
Bug-Id: CID 1238794

Also create an anchor for the unsharp filter, and references to
it in its mentions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should reduce the correlation between planes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows using different shifts per plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This makes the temporal noise case deterministic with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '97993237':
  ismindex: use tfhd default duration if no sample duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '460b509a':
  rtsp: Check a memory allocation

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

Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]

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