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

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

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

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

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

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

(cherry picked from commit d350820b)

Conflicts:

	modules/gui/qt4/ui/open_net.ui

(cherry picked from commit c282137c7fb604fc9c5efbc9810c857316c15fac)

(cherry picked from commit 246c01b392ab5f91e5beecf35cf1d013a42347c7)

(cherry picked from commit a1c5d036c2b1692a5670dfe197ed776084c35946)

(cherry picked from commit 7b337cff1e4ef7bcfd12ba5b0601cb62b44e793b)

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

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

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

(cherry picked from commit 31150350679286f873c94fc670ddbafddaed7163)

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

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 21f056e8c51e0c1f9ad522a41b5cfd48ea088160)

(cherry picked from commit 57bc01b040818f1b5251f08f1d8b8f527c6d2306)

(cherry picked from commit c7dd9b7ee11d95598e3c0414439b95bd220f7466)

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

The signal handler currently does nothing anyway, so this was a waste.
(cherry picked from commit b1a700d1e3e5432235afe6179f67d2d13707a3a3)

There was a small window of opportunity between RtspSetup and RtspAddId where this can happen.
(cherry picked from commit b445a6a9ffb600e4aa87793c21186d457631d588)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

TS-stream needs aud-nals, but didn't find any confirmation yet if ps needs those too,
so I assume it does. Maybe it would be better just to check first nal and set boolean for
adding aud.
(cherry picked from commit d5cec4585d66dd4c67c496ed29a163436774b793)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit eadba593a3010168598a4395fceecd392f8469c5)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit cd0c2c45c0198ec38cce4af877b033529639ddaa)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

See http://forum.videolan.org/viewtopic.php?f=14&t=78396
(cherry picked from commit fe145872fccb389edc97c3dea2463f4956bc3db4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit c2a9fa6d7c095caa26e60943c88e528d08e2eec0)

(cherry picked from commit 7f9b7d3e31101f97831b2e62ca25dc671de14c6b)

Conflicts:

	bin/vlc.c
	src/libvlc.c

(cherry picked from commit d3b02be6e47870bb1dff74f99bfa510fc4140646)

Conflicts:

	bin/vlc.c

(cherry picked from commit f566eb87f26199f73d9f7cec71724872c0fca714)