* commit '66a68ddd':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a75c2eb2':
  lavc: make rc_eq into private options of mpegvideo encoders

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

* commit '946f9535':
  lavc: make rc_qmod_* into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a6e4ce9f':
  lavc: make rc_qsquish a private option of mpegvideo encoders

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

* commit '6cbbf059':
  resample: Avoid off-by-1 errors in PTS calcs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Should fix fate-mpeg4-resolution-change tests

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

* commit 'fb238f82':
  urlprotocol: remove unused url_interrupt_cb declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.

Bug-Id: 753
Signed-off-by: Anton Khirnov <anton@khirnov.net>

It is a remnant of the old interrupt callback API.

* commit '9bec3ca2':
  rtmpproto: Add pause support

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

* commit 'f4cd8b80':
  rtmpproto: Track last received timestamp
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Only ECB mode is supported at the moment
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

It is supported as a codec option, and those are already parsed.
Signed-off-by: Marton Balint <cus@passwd.hu>

Once the frame queue is full, we will wait anyway.
Signed-off-by: Marton Balint <cus@passwd.hu>

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

Some RTMP commands need the most recent timestamp as their parameter, so
keep track of it. This must be the most recent one and not e.g. the max
received timestamp as it can decrease again through seeking.
Signed-off-by: Martin Storsjö <martin@martin.st>

This fixes the abnormally high ts overhead in the files produced by the
HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For
example makes it much more likely that it can produces streams that fit
under the 64kb App store limit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bae557ed':
  dump: display codec tags when available

Conflicts:
	libavcodec/utils.c

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

* commit '66e9f839':
  libfdk-aacdec: Enable Dynamic Range Control Metadata Support

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

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>

For both audio and video.

* 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>

For streams which contain DRC metadata, the FDK decoder is able to
control rendering of the decoded output. The rendering parameters
are detailed in fdk_aac_dec_options [].

The default behavior is left up to the decoder.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>