* commit '8bef4338':
  smoothstreamingenc: Simplify code by removing a redundant variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

move the code after the existing NULL check
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bd239c9a':
  lavf: Don't drop both pts and dts if timestamps are invalid

Conflicts:
	libavformat/utils.c
	tests/ref/fate/vc1-ism

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

In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.

This improves playback of HLS streams from GoPro cameras.
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes undefined shift
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes segfault when using sendcmd with drawtext.

Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.
Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Makes ffmpeg abort instead of continuing when stop_time <= start_time.

Closes ticket #4015.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If the chroma planes aren't subsampled, automatically select
the 4:4:4:4 profile.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Ruoyu <liangry@ucweb.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '1d4579e3':
  tcp: Add AVOption support

Conflicts:
	libavformat/tcp.c

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

* commit 'cd9d6399':
  tls: Support passing old-style tcp options

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

* commit '3df8d52f':
  rtsp: Add rtsps to the probe
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c839b043':
  rtsp: Support tls when in listen mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b2e9636':
  rtsp: Support tls-encapsulated RTSP

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

* commit 'c27328e7':
  rtsp: Check for command strings without spaces

Conflicts:
	libavformat/rtspdec.c

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

* commit '09e1ccc8':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
	libavformat/sctp.c

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

* commit 'eb4f9069':
  lavf: More informative error message

Conflicts:
	libavformat/mux.c

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

Mimic decoder and obey sampling.

Does not affect fate tests for utvideo.
Fixes ticket #3949.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Support only one independent substream right now, and only syncframes
containing 6 blocks.

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

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

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

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

Make tcp and tls urls near-interchangeable.