(cherry picked from commit 8078a54f2c4365bf7f94a81fe0a0fd61a574cca1)

Which was wrong way anyway.
(cherry picked from commit b986c0673d293d7c334eeac199c9f91160ed7906)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

also fix sub 720p defaults
(cherry picked from commit 16ea0e630bc4cb792c132ff15d3d6a1f8a5e5f06)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

We don't want that anymore anyway
(cherry picked from commit db60e23c082afbfbd8bc205aba89a1ad23c4879e)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

We parse the additional HTML5 section too, the only place where the
WebM formats are listed. If the URL contains "&html5=True", the WebM
formats are preferred, when available.
(cherry picked from commit f18b314bd2e6059e73fbc4dc18000c18aa6e4535)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

This also saves one HTTP redirect
(cherry picked from commit 09b6b8e32fe1e46e1f69d8dec0df29975a83f649)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

VP8/webm profile defaults to 720p, which could be reasonable default imo.
Not sure if people want to it to default to same resolution as input is.
(cherry picked from commit e8b350df4f1985fab19f797f0fb926c21bff18b8)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

First priority is file-extension user gives, if that isn't
specified, use mux-value and if that's not valid (eg mp4), fallback
to flv-muxing.
(cherry picked from commit 9aba558dbc3441a9f96eca41fe823e84907bc2d4)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

Doesn't allow mp4-muxer on other than file-output (doesn't check rtp atm).
Also tries to be littlebit clever and cleanup sout-mrl.
(cherry picked from commit b46a8cb9e596cc5d0b69480cb374d382cdc46b90)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit 9589b73d0d6e10ef61f5464b93da5aea1b3550f1)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit c5010ad330c808122ca16cdcbbd1b20d330b1d4b)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit 972e458c4744e95e67f57b73758db9197b3f5582)

(as with old http interface). Also added '-Lua Web Interface-'.

Adding the '-Lua Web Interface-' will give an easy way for applications to tell whether they are dealing with the old or new interfaces. The commands are somewhat different, so this is important.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit eb2becab3fe2e0872a3b6f21a71b95f3e2fcd2e6)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit fd28e9fee81c90265984bc943ebb63af7643a860)

(cherry picked from commit 02a7f81f74280114c783f75903109e96c1b60173)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit aa34b13d14c5fe5a5b5abdf0010aace03f7a7d70)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit ddfbaea04ac415ce036350e3f2244b6f6bb881dc)

Conflicts:

	include/vlc_threads.h
	src/misc/threads.c

(cherry picked from commit e3c350269cf1b482d2f6842e5b31a83be27a1c40)
(kept core part only to minimize changes)

(cherry picked from commit 3e258835cb95562a5a8ebbbb9f6c11e7b073a41b)

(cherry picked from commit a7c0e2a065b845e9bdd7f00bb7bd8e86a93b5dbe)

Conflicts:

	include/vlc_vout_display.h

Updated German translation by Michał Trzebiatowski and Mario Siegmann with some minor changes by me.

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>

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

(cherry picked from commit 9521f0a0a3073c63c54f4dd002ab62eab5d01b86)

It will be hard to convince all Mozilla plugins-capable browsers to
call XInitThreads() early enough, if it ever happens. In the mean time,
make sure we use only pure XCB and avoid Xlib in VLC plugins.

Note: I did not check that the web plugins itself was not using Xlib
outside the main Mozilla browser thread.

This should fix #3662. We loose GLX and PulseAudio inside Mozilla.
(cherry picked from commit 9886f288158ad2a56d8e2d66910ccde2c87e7206)

Certain LibVLC applications fail to call XInitThreads() before they
call XOpenDisplay(). Then VLC calls XInitThreads(). Then the
applications call XCloseDisplay(), which raises a segmentation fault.
In this case, Xlib tries acquire lock that was never created as the
Display ppinter was created before threaded Xlib mode was enabled.

These applications can now pass --no-xlib to libvlc_new(). This will
prevent any VLC Xlib-based plugin from being used. Currently, this
affects interfaces (not really an issue), PulseAudio (until Colin's
patch is merged upstream) and GLX (Xlib-based by design).

This will be necessary to address #3662.
(cherry picked from commit 95c95cc91ac583b76582b63dfd6c95ca5fdde592)

(cherry picked from commit b4b9d3840f13781db372a7dcf4613d4a35d26784)

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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 286d3083010d5e1835f8d6983f756a06e7f677c0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Compiling qt on win32 is still long and painful
(cherry picked from commit 7d2baa8648e87491bf7492c19583754d407a65e9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 45ac6e578e11e63c69a6ee537ade1b02ba5697db)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>