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

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

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

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

(cherry picked from commit bfd061bbf3aaa9da2d648de8c79d9f0ee75bfac9)

(cherry picked from commit 421d5ae77d686b592aaa4fa45ac4a2c1c3629fe0)

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

(cherry picked from commit 0ad85b8520873e54cd1e11c3494f0ec621497404)

(cherry picked from commit f3afae4fa71971a7a7d5359ec6f97a2925521f6a)

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 615bcffe5297b99422ffec435228ac015ae12d64)

Conflicts:

	src/text/strings.c

(cherry picked from commit c0dccd6f57da1f9a832aea1402c24c3c33c0da98)
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 ec1859e9991185b43b3b05815654e8326dd6728c)
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: 2a4a8f9a3f57087ac320a090442c876e94cda9c7

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

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

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

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

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

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

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

(cherry picked from commit 87c351e58ad9f47e75ed8c165df229655075466d)
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 b7508014f4b124bd1a98f32fbe59ef803198e7b9)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

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

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

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

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

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