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

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

(cherry picked from commit bfd061bb)

(cherry picked from commit 421d5ae7)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 0ad85b85)

(cherry picked from commit f3afae4f)

Handles "\\hostname" properly.
On Windows, error out on "X:directory" instead of aborting. Looking up
the current directory of the specified drive letter would be a better,
though.
(cherry picked from commit 615bcffe)

Conflicts:

	src/text/strings.c

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

Qt/EPG: Try to display intelligently the short and long event description with the dedicated widgets.

It depends of the channels. Some use only the short one, others only the long one and others both.
(cherry picked from commit ec1859e9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

When an item gets sub-items, we have to run our own random-picking among
the new items.

Cherry-picked from commit: 2a4a8f9a

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

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

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

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

PIX_FMT_RGBA is not a define, but an enum member.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit c23388a9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

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

use NSAutoreleasePool::drain instead of NSAutoreleasePool::release since VLCKit ist compiled with Objective-C Garbage Collection = Supported
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit b7508014)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 378c8027)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

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

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

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

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

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

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

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