* commit '2443e522':
  lavu: add wrappers for the pthreads mutex API
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

By appending `?dscp=26` to the URL, IP packets will be classified as
AF31 (assured forwarding for multimedia flows with low probability of
loss). On congested network, this allows a user to assign priorities to
flows.
Signed-off-by: NVincent Bernat <vincent@bernat.im>

By appending `?dscp=26` to the URL, IP packets will be classified as
AF31 (assured forwarding for multimedia flows with low probability of
loss). On congested network, this allows a user to assign priorities to
flows.
Signed-off-by: NVincent Bernat <vincent@bernat.im>

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

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

Fixes out of array read
Fixes: signal_sigsegv_35bcf26_471_cov_2806540268_CAINIT_A_SHARP_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Also add no-op fallbacks when threading is disabled.

This helps keeping the code clean if Libav is compiled for targets
without threading. Since we assume that no threads of any kind are used
in such configurations, doing nothing is ok by definition.

Based on a patch by wm4 <nfxjfg@googlemail.com>.

Ensures that the header include order is such that winsock2.h is always
included before windows.h or that windows.h does not include winsock.h.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

libavutil/ppc/util_altivec.h : fix load_with_perm_vec() add marcos vcswapi2s() vcswapc() VEC_SPLAT16() VEC_SLD16() for POWER LE
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '675ac56b':
  Revert "lavf: Don't try to update files atomically with renames on windows"

Conflicts:
	libavformat/dashenc.c
	libavformat/hdsenc.c
	libavformat/internal.h
	libavformat/smoothstreamingenc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '79fd186a':
  lavf: Use MoveFileEx instead of rename/_wrename on windows

Conflicts:
	configure
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '9326d64e':
  Share the utf8 to wchar conversion routine between lavf and lavu

Conflicts:
	libavformat/os_support.h
	libavutil/file_open.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

This reverts commit b9d08c77.

After taking MoveFileEx into use, we can replace files with renames
on windows as well.
Signed-off-by: NMartin Storsjö <martin@martin.st>

This allows getting the normal unix semantics, where a rename
allows replacing an existing file.

Based on a suggestion by Reimar Döffinger.
Signed-off-by: NMartin Storsjö <martin@martin.st>

This doesn't add any dependency on library internals, since this
only is a static inline function that gets built into each of the
calling functions - this is only to reduce the code duplication.
Signed-off-by: NMartin Storsjö <martin@martin.st>

Fixes out of array read
Fixes: asan_heap-oob_177e222_885_cov_1532528832_MERGE_D_TI_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-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>

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

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

This function became very short and can be logically merged with add_codec().
Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

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

Moving line_num into FFServerConfig as parser state,
saves many passes of it aside of FFServerConfig pointer.

ffserver_save_avoption() and ffserver_opt_preset() have
redundant arguments. They can be obtained basing on media type.
This simplifies uses and reduce chance for a mistake.
Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>

This will be useful for the following commit