(cherry picked from commit 6468340ccbc5e1ca6500e82a27b7cb317b5c0b6b)
Signed-off-by: Konstantin Pavlov <thresh@altlinux.org>

(cherry picked from commit 7a7e042e)
Signed-off-by: Konstantin Pavlov <thresh@altlinux.org>

(cherry picked from commit 4b800920)
Signed-off-by: Konstantin Pavlov <thresh@altlinux.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>

all files would be opened as directories

Pointed-out-by: cachereturn on #videolan
(cherry picked from commit 9b1ce0e8)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>

Verified by Marian Ďurkovič
(cherry picked from commit 3cdb4538)

macosx: quite obviously, it's no good idea to require protocols which are available in future APIs only *coughcough*

This partially reverts [52b21462]

macosx: explicitly show the protocols the objects are implementing, use a modern API method in the wizard and fixed some minor warnings

(cherry picked from commit eaeba49b)

Deeper code can cope with too overly large values.
We need to accept seemingly too far start times because the length is
typically not known at startup (and hence set to zero).
(cherry picked from commit 3629d607)

(cherry picked from commit 92f02a13)

(cherry picked from commit 4d218ceb)

(cherry picked from commit 291738ae)

(cherry picked from commit e7fbfdcb)

(cherry picked from commit 8d40ad0a)

(cherry picked from commit 743c9d5c)

This should fix spurious BadWindow errors from the video displays.
(cherry-picked from commit 1c201d48)

There has been a few X11 error crash reports against 1.0, though I do
not know if this will fix them (could be another problem). Basically,
XFlush() is insufficient, as it does not ensure that the X server has
processed the requests.

Conflicts:

	modules/gui/qt4/components/interface_widgets.cpp

We were accessing some main interface variables from random threads
without serialization. This simply moves the blocking connection signal
from sole size setting to the whole video widget request call. In the
process, we can remove two signals. We still need a blocking connection
signal. It does not add any new deadlock case, since there was already
blocking connection signal in the same call and in the same direction.
(cherry picked from commit 7c6ef80c)

Conflicts:

	modules/gui/qt4/main_interface.cpp
	modules/gui/qt4/main_interface.hpp
	modules/gui/qt4/qt4.cpp

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

As I understand this has been a temporary workaround for libvlccore, which seems to have been resolved.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit ee25a62a)

New protected field bool PLItem::b_is_node to have the data at hand.
Then only check this field in PLModel::flags().
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 968dd88a)

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

Current description on default mode ain't actually any good, but didn't
find better from x264 commit-log. Feel free to add better description.
(cherry picked from commit 9353b582)

Rename types and add compatibility macro for old libass versions.
Signed-off-by: Laurent Aimar <fenrir@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Cherry-picked from e8189268

contrib: added debug to see what we're actually doing when changing the prefixes of the included binaries

(cherry picked from commit b5a844bc)

(cherry picked from commit 47648bd4)

Add:
- http-user-agent
- ps-trust-timestamps
- vout-event
And some rtsp options (username, passwd)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 8d58d014)

(cherry picked from commit 18616970)