(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 6b5b319c)

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>

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

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

Fix #6375
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 22c24d5aaf7a41f8f0a3beb49039ec8415767263)
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 511519e3420eb716616f321f3d0bc630c2261414)
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 3ead74ab142286d39f1f155569a3f389d7e5f28f)

(cherry picked from commit ea4e38b539b4c0a4b36d047292a84ad92b6bed25)

Conflicts:

	modules/access/dtv/linux.c

(cherry picked from commit a9862530656860c69d51d8a8fbe75baae0149e91)

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

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

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

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

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

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>