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

Conflicts:
	libavformat/smoothstreamingenc.c

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

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

Conflicts:
	tests/fate/mpeg4.mak

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

Signed-off-by: Michael 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: Michael Niedermayer <michaelni@gmx.at>

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

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

Signed-off-by: Michael 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: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Currently this is another name for ff_http_averror()
Signed-off-by: Michael 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: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Conflicts:
	libavformat/nutdec.c

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

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

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

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

* commit 'd1afd3e1':
  vf_format: check input validity

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

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

* commit '7b48bf95':
  wtv: clean memory on error

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

* commit '9fbc613f':
  wtv: check seek_by_sector return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd7f530b0':
  aviobuf: check context before using it

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

* commit '02484d1a':
  avio: fix sizeof argument

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

* commit '8ab3b71e':
  idcin: fix return check

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

configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Chapters do not have an event_flags field.

Bug-Id: CID 1231990

len is always >=1 in that case.

Bug-Id: CID 1238784

Expression already evaluated before, redundant since
05338686.

Bug-Id: CID 732199

CC: libav-stable@libav.org

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

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

Avoid a possible null pointer dereference.

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

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

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