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

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

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

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 500c1902bb2e2885e7aaca1f45a59ec26fb389e4)

(cherry picked from commit 9b247e7c299f53c905278c45bf45545dc4bcd390)

Conflicts:

	modules/gui/qt4/components/open_panels.cpp

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

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

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

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

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

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

(cherry picked from commit e6fde43b4a01cf0fde3e6f385c04099e46dbd036)

(cherry picked from commit b740301ca1847714f7c625b350379c859b99292d)

(cherry picked from commit d13f0eaaed1232ccfb09a4b81aafcf864351e3e7)

Conflicts:

	configure.ac

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

(cherry picked from commit a8ad08b24825b310d10bbc9846ad0a7000c418b4)
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 5b30daa8add8e4563fc26a33e73fa7353f810ac9)
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 6fe18b3e023d1c58571d982cc41b43363c45cfae)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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>