* commit '530c1441':
  lavc: make lmax/lmin into private options of mpegvideo encoders

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

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

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

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

* commit 'c4f7bee0':
  lavc: deprecate unused mb_threshold field

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

* commit '685be3d1':
  libvpxenc: add static-thresh private option

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

* commit '59b55c49':
  lavc: deprecate unused me_threshold field

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

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

Currently, this option is accessed through AVCodecContext.mb_threshold,
which originally controlled reusing MB data when transcoding mpeg to
mpeg. Since the libvpx meaning is completely different from the original
mpegvideo meaning, it is better to use a separate private option for
this.

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>