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

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

(cherry picked from commit 8ca5887a88523944efed9765aa46b52f17b5d595)

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

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

Yes, this still works fine as long as it's used in that one place in
the VLM.
(cherry picked from commit 151de06840b4da5a0680a6ca059b258b28420b0f)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

It's useless and create bogus empty commands, that output ugly blank
lines and crap during login
(cherry picked from commit a94688f91336176d32649824369dc9d9bde8d126)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

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

This prevented restreaming theora streams into ogg
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>
(cherry picked from commit 195355bee28c1307f243f138e574525868514720)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

Fix ticket #3958
(cherry picked from commit 8675d26cea713ca9ebae3b91bd7c3e9bb320dcb1)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>

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

(cherry picked from commit 33a042e0019f157bc2a6a136a247f9b9fc1bbd31)

See http://forum.videolan.org/viewtopic.php?f=13&t=83706
(cherry picked from commit 6c24f08b6b396f2e9737277a2b02c3446474dd16)

A socket is leaked when the client passes a wrong session identifier.
A remote attacker could craft malicious RTSP requests and...
(cherry picked from commit eea1cddcb651c874e66999a91962da3b3f85bed5)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit ffd3fce0a407c61e8e5aafdad666424fe5233609)

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

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

This reverts commit 6cd86bc2.

(cherry picked from commit 444c6a067575f5ec5a002a2204c31e734f50aa04)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
(manually removed string-change)

hmm hmm, we would need a generic en.po too.

(cherry picked from commit 24188e89)

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

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

(cherry picked from commit c4fc30952da85a6d7bc750c4fb0884eb5f206308)

Conflicts:

	modules/access/dvdread.c

(cherry picked from commit d626e6783470e2476b0b61d1c00aa2fe35d03bba)

Conflicts:

	modules/access/dvdnav.c

The original commit description is rather terse
  "ps demux: fix an issue in ps_pkt_read()"
so I don't really know what the "issue" is. But ps_pkt_size() really
made no sense as is.

This reverts commit d761cf6f.

Conflicts:

	modules/demux/ps.h
(cherry picked from commit 9dc746496551eb854ab6bf0ebdeb8c8ab5cd1709)

Paths for error message must be UTF-8; they were locale.
Paths for probing must be UTF-8 also, as vlc_fopen() does the
conversion to locale internally.
(cherry picked from commit f2513588b0099ce5634b7094246bac63d503a3c2)

Conflicts:

	modules/access/dvdnav.c

Paths given to msg_*() function must be UTF-8, not local.
(cherry picked from commit 140a43f3d3394f92b3d8079ce79e343dd0a6738e)

Conflicts:

	modules/access/dvdread.c

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

Pointed-Out-By: Kano

this should fix https://bugs.launchpad.net/ubuntu/+source/vlc/+bug/521850
Tested successfully with compiz and metacity

Todo: adapt configure.ac to ensure XPM is available for skins2 (as done with mozilla)
(cherry picked from commit 7e7ead5d)

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

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

(cherry picked from commit 27e2bbff)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>