(cherry picked from commit aaec0d4e)

(cherry picked from commit 0849d6e5)

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

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

(cherry picked from commit 55cb3971)

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

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

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 29de0421)

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

Such a latency update is an opportunity to reschedule the stream
trigger time, or to trigger immediately if late. That can reduce the
initial audio delay in some cases.
(cherry picked from commit 1b06737a297cc5b9c48dd12e2e456b45bc6891d2)

(cherry picked from commit 6e56b492f796a458e06dc21d29d534849af12fd8)

Conflicts:
	extras/package/macosx/Resources/English.lproj/MainMenu.xib

The code is far from being great, but it matches the Qt intf now.
(cherry picked from commit cd612818db02b7831bec1d72e0a864f968daed6a)

Conflicts:
	modules/gui/macosx/bookmarks.m

(cherry picked from commit 44488d6d4cd586d9cafc9f5a0a2325a6a5285be2)

VLC has a native parser with higher priority. So ModPlug only got to
parse the broken files that VLC rejected. ModPlug is not robust and it
crashes in that case.
(cherry picked from commit 76b15d4038e1f2200ab463c275c0854848de8671)

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

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

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

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