(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>

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

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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 5519059009749a0357e95751cdde3b00d1f7f2b3)
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 aefd2599e05b82c01d468a1e7bc7a5f2b6ed8164)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 19bc50ee63bd5cd5b7b87c151e011bc5dec27b93)
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 b0db307c4cf3ac509fe33079f132a0dc6c939e22)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Nnot every options are implemented right now, only the most wanted.
(cherry picked from commit f5a1049dc3bdb660e5bfc29983e23ac9a7688345)
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 06e609ea922918f4d2d0f427049a236b4a4c08af)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

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

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 0ba54f498eafa5b8c081ff37ecd65d791c3718e9)
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 9e47aa722c12324cb5915750d717d9dc281ca7f9)

(cherry picked from commit cdb53ce67f80307fabd6d8447e9b55a5c25eb2ef)

(cherry picked from commit 53752a74e22c0a64d5af333d6a9d8475d2f541f1)

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 ffb2a1bbf249eec74366f9f0c8005a011661caa0)

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