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

Some small indentation cleanup.
(cherry picked from commit 446013a5b8fc9872eb0db3aee0ee65e8c551b8b8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This patch fixes a case triggered when alive stream does not "have" a meta playlist. In
that case hls_Copy would fail as the uri is NULL. Restore the old behaviour by using the
base URL locations as input.
Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>
(cherry picked from commit 64df9df7c3ec0141d8f9421e9177b2a94e21dba3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 6c5e08586e4cc8ac97ddcf43b6291ebc872546a6)

With this commit the mentioned features result in an actual change, when we are in fullscreen or "macosx-video-autoresize" is false.
Furthermore, this fixes nasty flickering when normal window is changed in size while using this features.
Also this commit makes sure, that no window resize is happening in any case, when "macosx-video-autoresize" is false.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit fa7456d3cddcfc2ad238ac3102463eef84d134a6)

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 7ecb24c8689710e32f71e20d2cc51ae5b57e7151)

Some GLX drivers, such as newer versions of the Intel drivers,
depend on X11 events coming from Xlib. So VLC cannot steal them from
the underlying XCB connection.

I have no time and will to duplicate the XCB code found in the GLX
plugin for windowing and events handling using Xlib. So lets make a
separate X connection with XCB. This is inefficient, but it works.

On the plus side, this patch removes the dependency on libx11-xcb.
So it is now possible to compile and use GLX with an Xtrans-based
Xlib (though libxcb must be present).

(cherry picked from commit 63a73525adc604aad1282f5479660ee953cc6704)
(cherry picked from commit f886dc146251ea12443aafbcf77b99871c3e7c84)

(cherry picked from commit b8bec8eb9217e5a525f78777962c10b40838bc4b)

(I do not know why it was removed in the first place though - not me!
 As a consequence, we cannot scan TV channels in VLC >= 2.0...)
(cherry picked from commit d0413f1d8b0f16001a6c0820a081ce81fedf6b65)

Conflicts:

	modules/access/Modules.am

(cherry picked from commit 7ba4686d425697a1dda865b4369367a00f5ef91a)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit c29797349261fa30bc2521968d14118d2168d0de)

Conflicts:

	extras/package/macosx/package.mak
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit c80216bf)

macosx: make sure that all the tooltips in the sprefs panel are actually displayed in the user's locale
(cherry picked from commit ea3cc710ffba1e27dece6a7efea2fe1c7a6b01f6)

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

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

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

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 64337e22d9a2f0f7ccbb71f55dd7e6cd78b39ba2)
Signed-off-by: Rafaël Carré <funman@videolan.org>

It is now available on
http://addons.videolan.org/content/show.php?content=148709
(cherry picked from commit ce76b2b4f66293e2d48e664a22c1508e15541009)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit 90b7695c83dc677de4c29242341d5e0cf1c238b4)

Conflicts:

	po/te.po
	po/vlc.pot
Signed-off-by: Rafaël Carré <funman@videolan.org>

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

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

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 2ad64d87724ffe0256d6ac8056e2ef4af5b1192d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

this is especially important in multi monitor setups
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit c33a6b5e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes several issues when you move your mouse outside the fullscreen at an
sedondary display and reenter vlc with the mouse. Now, the controls are shown
reliably and the mouse movement actions work as aspected in that case.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 28dd1b12)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 53b2dfec)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

OK, this patch should take into account the recommendations.
Signed-off-by: Antoine Cellerier <dionoea@videolan.org>
(cherry picked from commit 9934897a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This became likely to happen using VoD. Thanks to Denis Charmet for
pointing out this issue.
(cherry picked from commit 7ed3e0e4)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

Deactivate totally avdevice and avfiters
Remove bink decoder that does not work in VLC anyway
(cherry picked from commit 2eccf89a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Don't hide the needed steps as it confuses users reading the detailed instructions
(cherry picked from commit c6a45bd9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

This  complements  commit dadb0622  which
moved  responsability  for   setting  the  user  agent   to  the  client
application.
(cherry picked from commit a3363d01443de5b3ff8b9762692662623e70d786)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

THe standard doesn't guaranty anything, but the code assumes it.
(cherry picked from commit e2942aee746d12ea0bed999e8110bbbead3ca72d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This makes the playback start faster.
(cherry picked from commit 1555e3ce33ff3a75c19fdae4af08d052aed734c8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

http://www.compdigitec.com/labs/2012/02/01/android-codec-benchmarks/Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit e6dd93cfe14c837d95dd29d24fc8e86924161c53)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Fix dbus assertion failure which aborts vlc when the dbus control
plugin is active and you try to launch vlc with a large number of files
on the command line (such as when doing "vlc *" to play all the files
in a directory).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 2e1a59d0a1fcca58171b890416a39e22db7adb6f)