(cherry picked from commit 2098f7858a9672c10527807511d0cd3daac458cc)

Currently, this is not used anywhere, but better have it for forward
compatibility. This is not as elegant as a dedicated libvlc function
call. But there is no other way to set a parameter before
libvlc_InternalInit() is called by libvlc_new(), short of changing the
libvlc_new() prototype (again). And that would probably be worse.
(cherry picked from commit ae16ebf3524a76da5b2584451bcf0f0f9fc820a4)

(cherry picked from commit cdb6faf0d09605a6af1216b4f75872ca3de8dcdc)

(cherry picked from commit affc7db0a6578bf9fe3ec96845584f4dbd305ae7)

(cherry picked from commit 3d37be4f70d386e9751ec41309f82475ffae0ad8)

Conflicts:

	share/lua/sd/appletrailers.lua

In theory, we should check that there is only one slash per token, but
it is not really dangerous.
(cherry picked from commit c10f4954f2cdc12c6e593c8975be159415b53619)

First, we should not let user shoot themselves in the foot. But most
importantly, we need to validate the string as it is marked as a safe
option (especially CRLF there could be disastrous).
(cherry picked from commit 2656ae56c83d87634ba5a137f118c04570ec8052)

Conflicts:

	modules/access/http.c

RFC2616 requires a space-separated list of names[/versions]
(cherry picked from commit f1dac78a4a5b3fa3f081f8ee29b1abdf27d20fca)

The new config value is duplicated, and the copy is stored to the
configuration. After the configuration R/W lock is released, we have no
warranty that another thread does not change the same configuration
item, and free our own copy. Admittedly, this is very unlikely.

Instead, we can simply pass the original string from the caller to the
callback - that one must remain valid through the config_PutPsz()
function call by definition.
(cherry picked from commit 6b35f6ff09419006d8af86cfb507fc644669a118)

The LUA interface is unmaintained, enough waiting.
Works around #3623, #3627, #3687, #3691.
(cherry picked from commit 1834c5a73ecf97c33e385c5f837af72a48a8672d)

Otherwise we cannot render videos with X11 (and fallback to
non-embedded SDL or ASCII).
(cherry picked from commit 12e39efb9eef08b7a6d242f076205fe6d5a23469)

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit 8d4ed76f1893399092b8fdb2b9ec00c700ea9e7b)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit 1a55a04d3be90206c4ca816e7532133d76946a5d)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

... so that waitpid() works even if our parent process ignores SIGCHLD
(SIG_IGN is preserved across exec*()).
(cherry picked from commit 94763831fb59701a30f7e55c8ce9258ddbeeff18)

This close #2383
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit f5b8f4a13fe40151abd54a009049e5d9a6e6780c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This was broken after the extension merge.
Close #3665
(cherry picked from commit 08737f85e0e34e8b75da567054389cc0521327e6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Sorry for last commit which was a little retarded
(cherry picked from commit 865a279f05af298d19e23aa75fafd012b0106e6f)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

This should help watching mp4-videos (&fmt=18 and 22 or something like that)
from youtube. ffmpeg for fallback for windows. Not idea about OS X side.
(cherry picked from commit fc5f04d8f6c4a79534d4530e4e15ab9a88deaeb5)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 7b93afedd622c26a7210859da4d078954d932f61)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit ae3528d43c44addfdb85afd6e1fa0bc9784af037)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

Seems that maxrate needs somekinda exponential function from bitrate (comparing
ffmpeg's libvpx presets) and cbr isn't something you likely will get out of this.
(cherry picked from commit d3c422e310bfaed687554e2553357b89b3b2a82e)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit 86263dcda269b17eff6b8a985f4865f176f44714)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit 3862bf72d11553807eae0d9933b3bde186d62ab6)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit c6bcc788be1ca4a91c9637a7b136d305f6d3ee08)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

5cc3984f92754e1fd3643039354f8f00c324a90c was too strict, and for baseline it
should be only cosmetic change.

libx264 changed default to normal in that build too, also change logic
littebit so b-pyramid selection works better.

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Reported by Lotesdelere

reported by Lotesdelere
(cherry picked from commit 018de320fa70078984c2744b4f994467d8a7c4dd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 025e08ce9c5e67bd17ca1aa84b6a9a56e4e31682)

(cherry picked from commit 36c1cbc3f2e228ef120e7413cc2613d3f8aded5c)

Conflicts:

	configure.ac