Some codecs need less surfaces then 30. Relax the assert() to allow
other HW codecs too work too.

stream_Read() is designed to allow a NULL pointer as second argument.
Therefor this commit was wrong. I added a note to avoid making the same
mistake.

This reverts commit a7ef53d4.

Moves the vaapi-xcb branch to vlc 2.0.4 version.

Conflicts:
	modules/codec/avcodec/audio.c
	modules/codec/avcodec/avcodec.h

We do not know how to display it anyway
(cherry picked from commit 6b00c288)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

items stored in a xib should only interacted with after its loaded, which may be after NSApp is
(cherry picked from commit 1de6f934)

(cherry picked from commit e32da3cb)

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

(cherry picked from commit 8564f347)

(cherry picked from commit 17c0beca)

(cherry picked from commit e139c96c)

(cherry picked from commit 52576ea5)

AppKit could be accessed by a non-main-thread

This is a manual backport of 9dd2f6ed

(cherry picked from commit 99acb947)

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

Conflicts:

	contrib/bootstrap
	contrib/src/main.mak

(cherry picked from commit accf189a)

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

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

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

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

(cherry picked from commit bcc966ad)
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 7f0b0268

Manually back-ported from e5d1d745

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

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

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 06683a06)