Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

It is broken
(cherry picked from commit 4a44907a)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 87387eec)

(cherry picked from commit b79a47d8)

also make sure that the hotkeys plugin displays the correct string when autoscaling the vout
(cherry picked from commit 42444e4f)

Tested with big and small controls: now the time for a video >= 10h is displayed completely
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit b115a253)

Fix a regression introduced by c8b78f40656
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 1e95ac231d3849360466bc273f4f608211b61ab9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Pointed-out-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 500c1902)

(cherry picked from commit 9b247e7c)

Conflicts:

	modules/gui/qt4/components/open_panels.cpp

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

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

This is not the most elegant and completly perfect, but it will do for
now...
Close #5986
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit cf70aaa1)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit f1118479)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

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

(cherry picked from commit e6fde43b)

(cherry picked from commit b740301c)

(cherry picked from commit d13f0eaa)

Conflicts:

	configure.ac

(cherry picked from commit d923971d)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

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

- rename copied to used in hls_Read()
- improve comment in hls_Read()
- add assert() to GetSegment()
- various cleanups
(cherry picked from commit 5b30daa8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

If caller wants to skip data, there is no point to allocate a buffer and
put data in it. We just have to update the stream position.
Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>
(cherry picked from commit 6fe18b3e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 5ebbfb5b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(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