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

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

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

A too short delay causes issues with late packets being dropped by the
stream output. This reverts 32e94ee0

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

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

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

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

(cherry picked from commit cf6e402b)
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 151de068)
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 a94688f9)
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 195355be)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

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

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

(cherry picked from commit 33a042e0)

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

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 eea1cddc)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit ffd3fce0)

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

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

This reverts commit 6cd86bc2.

(cherry picked from commit 444c6a06)
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 c4fc3095)

Conflicts:

	modules/access/dvdread.c

(cherry picked from commit d626e678)

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 9dc74649)

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 f2513588)

Conflicts:

	modules/access/dvdnav.c