(cherry picked from commit 2368d549)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

The if condition was only true in a very very rare case, and even then the code is
incorrect (e.g. when the detached window is in fullscreen and the user closes
the main window).
(cherry picked from commit 80e730f1)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

This simplifies the code in several lines.
(cherry picked from commit de742db2)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

glXSwapIntervalEXT() does not return a value, contrary to the
SGI equivalent. In case of error, the X11 error handler is used.

This patch fixes compilation with conforming headers. It should still
be compatible with buggy Mesa headers where 'int' is returned.

For reference, see the specification here:
http://www.opengl.org/registry/specs/EXT/swap_control.txt
http://www.opengl.org/registry/api/glxext.h
(cherry picked from commit 9cf66c28)

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

With Martin Zicha and Václav Pavlíček contributions
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

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

Only version, copyright, mdate (NO mwait) and *dir are present.
ALL of them are outputting warnings.

None of this is in master. This is for smooth transition ONLY.

This is partially cherry picked from commit f7ee3edcSigned-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 8bce50f4)

This is neeeded on top on ab05bbd1 for
2.0 only
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 087fbc42)

fix for selecting the device with the correct UID
GUI and qtsound now both reference the correct UID
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit fd75aab3)

macosx: make sure that the options in a module list are displayed in the desired locale when displaying the simple prefs (close #6385)
(cherry picked from commit 54205a27)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

SA-1201
(cherry picked from commit 3a57afee)
(cherry picked from commit f5cb6357)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit e1b2c3bc)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

closes #5462
(cherry picked from commit a04e8454)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

(cherry picked from commit 6f7d72ab)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

getstatfs seems to work better than getfsent
(cherry picked from commit 701763cd)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit be3ffe18)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

Furthermore, this commit fixes close button functionality in dark ui style when video is playing
(cherry picked from commit 2709f26e)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

(cherry picked from commit 64637de2)

(cherry picked from commit cdf9d7ce)

Reported-by: Vincent Vinel <v.vinel@gmail.com>
(cherry picked from commit 11f1a3ea)

(cherry picked from commit 6b5b319c)

Fallback to the legacy VLC-proprietary "x-plgroup" for backward
compatibility with old VLC UDP streams.
(cherry picked from commit aea7f120)

The skins2 code checked for the audio volume to be zero. However the audio is muted with by caling
the function aout_SetMute() or aout_ToggleMute(). Use aout_IsMuted() to test for muted audio.
(cherry picked from commit 4f96ae4a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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