(cherry picked from commit 564cbe7b)

Conflicts:

	modules/demux/playlist/itml.c

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

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit c6ddd1d1)

(cherry picked from commit 4137a1d0)

(cherry picked from commit c9367612)

This was actually fixed by [697457bc] but then [952a943a] came which made it useless.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 7c39ad95)

This happened in many WMA2 mono samples where the codec information pannel said "ERROR"
(cherry picked from commit a1a45073)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Test cases are still *always* crashing in 1.0-bugfix...
(cherry picked from commit bd0571c5)

This restores the pre-1.0.0 behaviour. With the atomic vlcrc update,
VLC managed to work-around a read-only vlcrc. Indeed, Linux (POSIX?)
allows renaming a file onto an existing read-only file, which is
then replaced (both content and meta-data). In principle, you should
put the containing directory in read-only mode to avoid this, but this
is inconvenient as .config/vlc contains other files.
(cherry picked from commit eb54a41c)

(cherry picked from commit 75dda08f)

(cherry picked from commit 644185a5)

(cherry picked from commit fb3b3f25)

Conflicts:

	src/text/strings.c

Some URI types do not need URI-encoding, yet use the percent sign.
E.g. http://forum.videolan.org/viewtopic.php?f=13&t=61946
(cherry picked from commit 4ac6e6df)

(cherry picked from commit 06633533)

Conflicts:

	src/input/item.c
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 97140ee9)

It was introduced by 25a8f939.
(cherry picked from commit fbe14bc4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #2954. Patch by cherife on trac.
(cherry picked from commit bead3397)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit d0c3b82d)

This reverts commit 292a59e2.

(cherry picked from commit 5878fd30)

skins2: For Linux, correct files that cannot be loaded because of a workaround that only makes sense on Windows.

Forcefully setting a file name with lower case was inserted to solve an issue that is only true on Windows. On Linux, upper/lower case must not be tampered with.
This resulted in skins like Orangeade.vlt failing to load their fonts on Linux.
(cherry picked from commit 4f1060a7)

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

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Note that all outputs onto the same TCP port must have the same certificates.
(cherry picked from commit 123d3e48)

(cherry picked from commit 1cf4ccdf)

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

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

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

(cherry picked from commit ba501462)
Signed-off-by: Geoffroy Couprie <geal@videolan.org>