(cherry picked from commit e32da3cbef3f10e311f00d0a68e2037939a292dc)

This is more coherent with the rest of the worlds...
(cherry picked from commit 1c81c0863ba03ec8022aed8a8e3bac81884dd509)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 8564f347c93455da29ebd65cbc5d2540b259e90a)

(cherry picked from commit 17c0becaf161355c19c554fd472cefdfbe1b41eb)

(cherry picked from commit e139c96cdabca52827db8843d9aaa41eb50460a1)

(cherry picked from commit 52576ea50e1cb5d2fbb3ceba958128dc81ed13b9)

AppKit could be accessed by a non-main-thread

This is a manual backport of 9dd2f6ed46b8c4bb0399693dbb3f91d7efbfabb0

(cherry picked from commit 99acb947148500868c28998106e8af89555e2529)

(cherry picked from commit aaec0d4e1d1331645a61419345534498e976fe2d)

(cherry picked from commit 0849d6e510d6e46a9a90f24d96fc800dfbdeb998)

(not cherry-picked from commit 2b9e7ac1...)

This is for backward compatibility with existing VLC playlists and
VLC playlist generators.
(cherry picked from commit cb9a583ca2434457162da922548371cd30be7675)

(cherry picked from commit 55cb3971ca07c3ca103231e7d5f7ed939233bd09)

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

This should fix LP#947156.
(cherry picked from commit f36c50b0a05478a64f9c8a9b2df657ab625812d9)

Conflicts:
	modules/gui/qt4/dialogs/external.cpp

This mostly reverts commit 7240444d.
This broke threading rules for Qt4 GUI.

Conflicts:
	modules/gui/qt4/dialogs/external.cpp
(cherry picked from commit 29de0421e5c6b377cf6267da1b638c80507419b1)

(cherry picked from commit 6b521aafb0b4db719cd4b6a173b51f27971c9fec)

Conflicts:

	contrib/bootstrap
	contrib/src/main.mak

(cherry picked from commit accf189a2554fb52e4a362be55124f13f510fdfb)

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

Fixes #6346.
(cherry picked from commit 212b20ddf01c4eef7817e34a8107620bdff170ed)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #7348
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 42480e9fe9f1b4a39d566c5d85aeae92706a3934)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

With some adpation to 2.0 branch
Signed-off-by: KO Myung-Hun <komh@chollian.net>

macosx: fixed setting the following options on the command line: 'macosx-vdev', 'macosx-nativefullscreenmode', 'macosx-video-autoresize', 'macosx-black', 'macosx-mediakeys', 'macosx-appleremote'

This also closes #5892.

This is a manual backport of 7f0b026896bf32365a641b54bc9d88d95d45885d

Manually back-ported from e5d1d74558f5b116e10792e44e8aa85df0017fd2

(Here -1 means infinity.)
(cherry picked from commit 191f071695d272e99de17787d33e773606656430)

This is also used on *BSD systems.
(cherry picked from commit 052974831b2b50682a37933c992d2606fe1845b3)

With this option marked as unsafe, it is not possible to use it and
as a result, it is not possible to tune to different satellite on
different DiSEqC LNB.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 06683a063d0aa4096ff92edaa036d70853ec4b98)

This should fix DVB on *BSD.
(cherry picked from commit bfcefbf2b35650c8149ed9e94890f669187c8a50)

FreeBSD declares it in limits.h. Add the proper include.
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 62046de312966ae0c726f52dcdd66fb439b2d6d8)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

FE_DISEQC_SEND_MASTER_CMD will fail if command length is not set,
preventing multi-satellite tunning using DiSEqC switch.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit cfb1f18ec5543abfa35050600377548b69e6907a)

(cherry picked from commit 9309fb85a95717a64e6ac3634ffdfbb2d56c551e)

In some cases, that gets more accurate timing meaurements faster.

VLC does not use pa_stream_get_time(), so there is certainly no need
for pa_stream_get_time() to return monotonic values.
(cherry picked from commit 44bf8bbcb3fbd1d6c04c2ed8eec27f75f8faf340)