(cherry picked from commit 6ae98eec)
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 64df9df7)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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 63a73525)
(cherry picked from commit f886dc14)

(cherry picked from commit b8bec8eb)

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

Conflicts:

	modules/access/Modules.am

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

(cherry picked from commit c2979734)

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

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

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

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

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 64337e22)
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 ce76b2b4)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit 90b7695c)

Conflicts:

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

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

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

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 2ad64d87)
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 a3363d01)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit 7a081904)
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 e6dd93cf)
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 2e1a59d0)

Add languages above 30% to the Win32/Mac list.

Don't use the var_SetTime hack anymore and don't flush the fifo when
it's not necessary.
Fix #5967 and #2855
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 87ed819bada9492bc4b2e6e0ff2859797946edf5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>