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

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

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

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

Also include sys/param.h when trying to detect the presence of sys/mount.h so that the test works on OpenBSD, as documented by mount(2).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 3bc47647d909a49d80f06c6794eb54877523dc10)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 68c78698a5e97cdf0c7e66960bb26d81f48eacb2)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Removes the KDE scheduler hack.
(cherry picked from commit 725cf4eb04ab02491301a83d8ce6a5c3f5d80794)

Conflicts:

	bin/vlc.c

This fixes #3980, #4022 and #4025.
This reverts commit dd074f30.

The same check is already done in the dvdread, ps and vobsub modules.
(cherry picked from commit 8a497301054ccc2d9d470ade60264036d43e3fc0)

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

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

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

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

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