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

Prevent a NULL-pointer dereference.

CC: libav-stable@libav.org

Trying to write to a stream id larger the the maximum requested is
a programming error, still there is no reason to leave a
reachable abort() in the codebase.

CC: libav-stable@libav.org

Print the timestamp values and not just the stream index.

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

libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In vp9_decode_frame function, ff_thread_finish_setup is not called
when refreshctx is equal to 0, and the next decoding thread can not
start work until the cunrrent frame has been decoded completely. So
ff_thread_finish_setup needs to be called to enable Multi-thread
decoding in this condition.
Signed-off-by: Di Wu <di1028.wu@samsung.com>
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

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

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

* commit 'b7c3bfd5':
  w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Conflicts:
	compat/w32pthreads.h

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

* commit '73ea3ffc':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
	compat/w32pthreads.h
	configure

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

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

Idea from: a2c00d22Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

also remove a related dead store
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fixes build failure

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

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

Fix basename computation code to allow just file names without any
directories in the path.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>

compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.
Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>