This reverts commit 01afb771.

Warning: If credentials are required, we are going to have to assume
that KDE passes them in the URL. I have not tested if this was the case
or not. This is potentially nasty for those protocols whereby VLC does
not currently implement any login dialog. But ultimately, I would
consider this a KDE bug (if applicable).
(cherry picked from commit 08633adfd8fbff142848d6f80d18189814fa9c63)

Conflicts:

	share/vlc.desktop

It merely changes the mapping of track IDs. This can be used along
with --audio-track-id which is already marked safe.

This should fix Debian #466323.
(cherry picked from commit 6fe257af7ac15b8d524253bf34c23556323bdd00)

Conflicts:

	modules/demux/ts.c

(cherry picked from commit c7df60212025d4458c4d09280296d74ac6e6e173)

the current status file for 1.1.9 is one of these
(cherry picked from commit b3c26d999de3d0d56edf93e32ff448725010a1ff)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>

(cherry picked from commit 881fbe35477c1c360730b6bcc61e97e836ac3fe1)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

We need to select a format that can be output by the mixer, preferably
the exact format output by the mixer. Keeping the input audio format
breaks for non-linear input formats when S/PDIF output is disabled:
the mixer outputs FL32 that cannot be converted to MPGA, AC-3, etc.
(cherry picked from commit 1640b6840ac8d6f08b527950b6e30b9035bbe6fe)

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>

(cherry picked from commit 9ce1a13fb8fa77a38e0dfdfe3387829e1df3f085)

Conflicts:

	src/text/unicode.c

(cherry picked from commit 9b1e7f3839c0a36059d425c81dd31851148e71ae)

(cherry picked from commit 15c5e82683f89b63542b5f0ee71a059c6dcafdea)

(This does not affect directories and block devices.)
(cherry picked from commit 5699c34a510ae92568b903360e57ac0942fd3dcf)

Conflicts:

	modules/access/dvdnav.c

libmodplug is thread safe except when loading files or configuring settings
(before loading a file).
(cherry picked from commit 64b98d8415574337e8354c9ebb05c41d1d458f6e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

See http://forum.videolan.org/viewtopic.php?f=14&t=90169
(cherry picked from commit e0dabc4293c810e51cc20803b6b90156d8a12488)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

closes #4721

Ascending and Descending were wrongly translated as Aflopend and Oplopend, while
it is the other way arround.

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

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

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

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