No testcase known
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'af7ca6ea':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b69183f6':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'be42c0b8':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
	libavformat/rmdec.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '7207dd8f':
  rmdec: check av_new_packet return value

Conflicts:
	libavformat/rmdec.c

See: c01a462cMerged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

* commit '629b2ed0':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
	libavformat/flvdec.c

See: d7d5b5dfMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f22aa6b8':
  flvdec: avoid unitialized use of a struct member

See: 396ddcf2Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e73d26bb':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
	libavformat/smoothstreamingenc.c

See: b399816dMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '04d8af5f':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
	tests/fate/mpeg4.mak

See: c40a1bd2Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes 129533924_640.jpg
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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

Simplify scripting operations, so that n=1 is not to be considered as a
special case.

Use the correct timebase conversion.

Reviewed-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Currently this is another name for ff_http_averror()
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Reviewed-by: NBenoit Fouet <benoit.fouet@free.fr>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd2771a1d':
  rtpproto: Free the addrinfo pointer on failure
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '96bfb677':
  nutdec: Prevent a memory corruption

Conflicts:
	libavformat/nutdec.c

See: 05dd5368Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '350ed182':
  rtpdec_hevc: drop unnecessary check
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '322b571d':
  rtmpproto: remove dead code

See: 3a8b66afMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd1afd3e1':
  vf_format: check input validity

See: ee16e0caMerged-by: NMichael Niedermayer <michaelni@gmx.at>