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

* qatar/master:
  lavf: Add a fate test for the noproxy pattern matching
  lavf: Handle the environment variable no_proxy more properly

Conflicts:
	libavformat/Makefile
	libavformat/internal.h
	libavformat/tls.c
	libavformat/utils.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e2c272eb':
  LICENSE: Move (L)GPLv3 explanation block to a more suitable place
  swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #2299

* cus/stable:
  ffplay: do not cycle through unavailable show modes
  ffplay: add option to disable subtitling
  ffplay: use NAN to signal invalid external clock
  ffplay: if audio or video clock is invalid return NAN
  ffplay: allow frame dropping if we redisplay an already displayed frame
  ffplay: return true for pictq_prev_picture if it was successful
  ffplay: only quit from audio_decode_frame before decoding when paused
  ffplay: drop remaining frames in current audio avpacket when seeking
  ffplay: signal seek event to read thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 4a8fc1d8.

The commit caused null pointer derefernces when using udp://
after i fixed that it caused ffmpeg to get stuck and remapped
arguments like ?ttl=255 -> ?ttl%3d255

I dont want to leave this broken thus temporary revert so we all
have some time to look at this without half the network protocols
being broken in the meantime

In particular, fix trac ticket #2031.
Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Fixes ticket #2200.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket #2201.
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

This helps us not to make bad decision (frame dropping, audio compensation)
right after seeking when we do not know yet the recent audio or video clock.
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

This way the audio clock is updated to a proper value even when the video is
paused.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket #1928.
Signed-off-by: Marton Balint <cus@passwd.hu>

Improves seek delay.
Signed-off-by: Marton Balint <cus@passwd.hu>

This at least fix the build on CentOS.

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

The handling of the environment variable no_proxy, present since
one of the initial commits (de6d9b64), is inconsistent with
how many other applications and libraries interpret this
variable. Its bare presence does not indicate that the use of
proxies should be skipped, but it is some sort of pattern for
hosts that does not need using a proxy (e.g. for a local network).

As investigated by Rudolf Polzer, different libraries handle this
in different ways, some supporting IP address masks, some supporting
arbitrary globbing using *, some just checking that the pattern matches
the end of the hostname without regard for whether it actually is
the right domain or a domain that ends in the same string.

This simple logic should be pretty similar to the logic used by
lynx and curl.
Signed-off-by: Martin Storsjö <martin@martin.st>

Fix trac ticket #2242.

Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.

* fredjean/master:
  Include fix for building ismindex under MinGW
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Include cmdutils.h so we can build under windows. 

Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* qatar/master:
  x86: dsputil: Drop some unused function #defines
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '845cfc92':
  x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '096cc11e':
  x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31a23a0d':
  x86: dsputil_mmx: Remove leftover inline assembly fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>