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

Both were modified internally, but had no API changes.

(cherry picked from commit 8aa0cd827c9dea5266c3cdb2145564cd5b71b5f8)

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>

Close #4798
(cherry picked from commit f84dd14d1d66bef0b82acf65a5808e50e7801445)
(cherry picked from commit 30b2de492e4e0922fe069682cb94ae5eaa9d55c1)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This should fix Debian #499457.

(cherry picked from commit e697835136e323a244465b4c2be40f6a795b6f91)

Conflicts:

	share/vlc.desktop

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)