(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>

They may be inconsistent on broken multi-processor hardware. But the
system tick count is causing worse problems with power saving features.
(cherry picked from commit ef61df309612786ed316534908978a2a9340e154)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Too many quotes.
(cherry picked from commit 5925a3846f7268fc710db8273096754b0aaf35e4)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

Fixes issue for me when doing transcode{}:gather: --sout-keep and subtitle
overlaying from dvbs. Otherwise keeps last subtitles on video if new channel
doesn't contain dvbs track.

also consistenty as spu_Create is called on transcode_spu_new()
(cherry picked from commit 41b8c2e1f660c767ee7a96ab69204b94b1470ca8)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

We must first close the stream before deleting the tracks, because tracks can be used in StreamClose callback.
This crash could only happen in recents version of live555 library.

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

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

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

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

Fix out of range memory access when APIC frame type is out of the range defined in the ID3v2 specification (corrupted tag or vendor defined).

Fix #4163.
Signed-off-by: Fargier Sylvain <fargier.sylvain@free.fr>
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 639c195bf4a6e89e32042663857165b7eb05b33b)

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

This fixes the video output on PowerPC based Macs. A proper fix would be welcome.

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

XP is too old. Deal with it. Will ease support
Close #3727
(cherry picked from commit 2f8eed3529a8e39b632fc2a2b5fb552529762692)
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>

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

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

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

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