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

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit fb92e7a0440af1dcb237479702e559e0278a8bca)

At least with X11, the mouse may move without changing coordinates.
We need to re-arm the cursor hide timeout since the cursor was shown.
(cherry picked from commit ac6b127e)

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

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

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

Close #3893
(cherry picked from commit e2254d4c)
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>

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

1.6.0 does not support cover arts but the later version does support it.
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit d456bb4a)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

(cherry picked from commit d4b758bc2b2edc79e6732de44b1b72c5a6a03005)

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

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

This reverts commit f5b8b43a9e210a70e016871db6bab36929d6b866.
(cherry picked from commit 41297efb1b500434e8a8902b315290c4c516f67c)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

This reverts commit 8c1d2b3e3a20805becc4ce0d800f6f0c40de50dd.
(cherry picked from commit d97a54a6417348376e26cc5f4d5ba9bbc698ede7)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Don't ask me why, but libaa depends on Xlib.
(cherry picked from commit d6d738ce6ec022d25c2dda2c12d9c194092230f4)

(cherry picked from commit d350820bdecf153a9e1ea072c672f240b7114992)

Conflicts:

	modules/gui/qt4/ui/open_net.ui

(cherry picked from commit c282137c7fb604fc9c5efbc9810c857316c15fac)

(cherry picked from commit 246c01b392ab5f91e5beecf35cf1d013a42347c7)

(cherry picked from commit a1c5d036)

(cherry picked from commit 7b337cff)

Two new functions added:

 * val = libvlc_audio_get_delay( p_mi )
 * libvlc_audio_set_delay( p_mi, i_delay )

The delay is measured in microseconds.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit b8a46d56)

As suggested by Jan Janak <jan@ryngle.com>
(cherry picked from commit 6bbabbb5)

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

(cherry picked from commit 31150350)

Conflicts:

	src/control/media_player.c

 - add an optional display callback,
 - make unlock callback optional (planes could be static),
 - pass an opaque picture identifier from lock to unlock and display
   callbacks (this would enable multiple pictures later),
 - pass pixel planes back to the unlock callback for convenience,
 - use pointer VLC variables instead of configuration strings,
 - fix an unlikely memory leak.
(cherry picked from commit b401af054814d7067ef6217133b437e5fe695bfa)

Returns NULL if the variable cannot be inherited - pointers can never
be found in the configuration.
(cherry picked from commit fd907c9abaa6304442ced84809bdb53600c922ca)

Conflicts:

	include/vlc_variables.h
	src/misc/variables.c

(cherry picked from commit fd05e9c1)

Entity encoding was missing (for options) in generation of an xspf playlist.
On the reading side the entity decoding is all fine.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 21f056e8)

(cherry picked from commit 57bc01b0)

(cherry picked from commit c7dd9b7e)

avcodec native decoder has priority over libvpx one, and I don't know
howto change that easily. Fix #3820
(cherry picked from commit 73339d95)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>