(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 9886f288)

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 95c95cc9)

(cherry picked from commit b4b9d384)

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

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

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

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

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

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

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

This extension is in French only.
A german version may appear soon.
(cherry picked from commit aefd2599)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

The passed flags in the variable i_flags are now applied to the new node.
This solves bug ticket #3690, where it was possible to delete the "Playlist" and
"Media Library" nodes, since the read-only flag was not set for them.
(cherry picked from commit b0db307c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Nnot every options are implemented right now, only the most wanted.
(cherry picked from commit f5a1049d)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Description of the bug:

 This freeze happened only on Windows (tested on XP & Wine), but not on
 Linux. If I only moved up the "killInstance()" line, then the freeze
 would happen only on Linux but not on Windows.
 In these cases the QDialog's destructor never returned.
(cherry picked from commit 06e609ea)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 79fc0522)

We could use QPixmapCache here too, but I don't think it speeds up it
any noticeable way, just makes code littlebit longer.
(cherry picked from commit 0ba54f49)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

Since they cause crashes pretty much all the time (KDE bug #234484).

Fixes: LP#408719, Debian #580396.

The XVideo and X11 outputs can cope with this properly now
(cherry picked from commit 9e47aa72)

(cherry picked from commit cdb53ce6)

(cherry picked from commit 53752a74)

X11 inherits properties from the parent window by default. XVideo does
not (typically) like ARGB visuals. To create plain RGB window on an ARGB
window, we need to force the color map, background and border parameters
to non-ARGB values.
(cherry picked from commit ffb2a1bb)

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

Closes blocker #3262
(cherry picked from commit d24e4588)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close  #3700
(cherry picked from commit 8cfa162d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>