(cherry picked from commit 61918560)

(cherry picked from commit 40486dcf)

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

This commit create conditional lines in the Windows
installer script to not try to install some features if
they have not been compiled.
(cherry picked from commit 599883e0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Fix description inversion as Nicolas Rault described on @vlc.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 1ba9b1f2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit a63ddf96)

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

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

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

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

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

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

Fix segfault if memory allocation fails
(cherry picked from commit 944b1484)

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

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

(cherry picked from commit 38b6dd51)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

(cherry picked from commit 16f6bf94)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

Empty parameter means "default/guess".
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 326f4d40)

It allows playing multi-channels TTA and fixed a segfault as the decoder
does not check for sufficient space.
(cherry picked from commit 698c8900)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

(cherry picked from commit 9139b342)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

It seems to create an infinite loop.
(cherry picked from commit a1fa3487)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

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

As skins2(Windows) runs in the main thread, special care must be given to playlist/input/vout termination. Up to now, vout threads kept on running with the GUI event loop no longer operational, leading to vlc hangings.
(cherry picked from commit b1680840287cea049b8ad1e1ff8be0de96f101e4)

Since skins2(Windows) is run in the main thread, the default mechanism couldn't work.
(cherry picked from commit 6c5bf42f)

(cherry picked from commit 1c4ea6e1)

(cherry picked from commit af7bad86)

(cherry picked from commit bc6d0013)

From: http://greg.geekmind.org/viewgit/?a=commitdiff&p=libass&h=2b4a7365b172bb0b5ee093329a7acdf6bce1cb8d

For this release, this will likely due. In the future we should use greg's version, but it's not API compatible, and not simple to support both old and new api at this moment.

It should work as the vout never deletes the pictures used by a decoder.
(cherry picked from commit a3d9fc2e)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 28fd4de9)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

This should not be forwardported, in master all URIs should be URIs.

It's either paths or uris.
(cherry picked from commit 6148ec64)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

This fixes using marq and rss filter with default options on Mac OS X.
(cherry picked from commit 770f625a)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>