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

(cherry picked from commit 2368d54953fc4e7731d29ae8749c5ffb3ecb03b8)
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 80e730f1e4d67f4a00428220ed170d477c85032a)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

This simplifies the code in several lines.
(cherry picked from commit de742db20a39f116ca2505926fe1a0e9c20de47a)
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 9cf66c2856ab3a209fe15ec5662a8cd927ee20bc)

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 94dd5e7fbb7c6a6b35a1b1d11ef70ae2fb428f9d)
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 8bce50f4b059f638d5f92323e6fec8c5318c432a)

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

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

(cherry picked from commit 087fbc42182507dea9fb8bbe49ae7c3b7cbfbe52)

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

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 54205a270031f83867599a45201e4f2da2c46652)

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

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

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

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

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

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

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

(cherry picked from commit be3ffe18f1ab6512a51cd96764177aa2c71f98bf)
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 2709f26e4112d8f1745cec7893efeb45368bb814)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

(cherry picked from commit 64637de2753e3ff571a703ab540af181359e9e86)

(cherry picked from commit cdf9d7ce729d9dbb1f9deddd9dde331667c33d65)

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

(cherry picked from commit 6b5b319c452a328f93f6466eb9b934eb1513d266)

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

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 4f96ae4a9bf70543b421e1b039cad0356a696b92)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>