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

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

Fix #6375
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 22c24d5a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes some problematic behaviour, when the user changed some settings
but has still not made a restart.
(cherry picked from commit 511519e3)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

The default gain of 0.2 was way too low compared to other audio codecs.
(cherry picked from commit 3ead74ab)

(cherry picked from commit ea4e38b5)

Conflicts:

	modules/access/dtv/linux.c

(cherry picked from commit a9862530)

This should fail safe, but it is still ugly.
(cherry picked from commit b517ac74)

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

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

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

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

Although this was not reported, this suffered the same problem as A52.
(cherry picked from commit 6493879248c4ea2d13f794bda75144e13a12399f)

This closes a heap overflow on corrupt files.
Pointed-out-by: Clément Lecigne <clemun@gmail.com>
(cherry picked from commit a6e127f134e42f5d1d5ea9d9b8d055ce42e8caf8)

It behaves badly on Win32
(cherry picked from commit 829b5a923845e3b3f6a7c57c90060410bedb47b3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

CVE-2012-1126 up to CVE-2012-1144 and SA48320
(cherry picked from commit b737cac862fe1807e9026c5bfcb9966d3b44cf4a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit bdb36c1b184cd62ccc633b493d5c8fe9e21770ed)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit 521f40906c11615b9da6fabb19870724b91769fb)
Signed-off-by: Rafaël Carré <funman@videolan.org>