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

(cherry picked from commit f59b8d8a)

(cherry picked from commit d23fec0d)

(cherry picked from commit d6fb22b90ee4a6842a7c63edd19c119b80f04227)

(cherry picked from commit 993fe206c2d56ebc6664073413e100ee359c0615)

(cherry picked from commit d17b37cf)

(cherry picked from commit a924dfab)

Conflicts:

	modules/gui/skins2/controls/ctrl_list.cpp
	modules/gui/skins2/controls/ctrl_tree.cpp

(cherry picked from commit c4382505)

(cherry picked from commit 269a815d)

This partially reverts f1175e71.
(cherry picked from commit d02001eb)

(cherry picked from commit 23414d63)

(cherry picked from commit 29b00f3f)

(cherry picked from commit 5f9fc1ca)

(cherry picked from commit cd5c7ace)

...rather than extension (if any). Fixes: #3016.
Also make the code a bit more generic.
(cherry picked from commit 2037bb71)