Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit c3115212)

aout_Restart() is quite buggy (IMHO) and restarts the audio output
from the interface thread. Then Qt4 external dialogs are buggy as
they deadlock if called from the interface thread (I cannot find a
direct way to use BlockingQueuedConnection for foreign threads and
DirectConnection for the interface thread).

Until either or both of those bugs are fixed, we cannot use modal
dialog from the audio output.
(cherry picked from commit cbe1cda8)

This reverts commit 110693d5.
This fixes #3599.
(cherry picked from commit 6eb90af3)

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

And don't unlockgl if lockgl wasn't successful.
(cherry picked from commit 0484b127)

It closes #3543.
(cherry picked from commit f9f6f88c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 827d60ce)

This fixes transcoding with VLCKit.
Signed-off-by: Pierre d'Herbemont <pdherbemont@free.fr>
(cherry picked from commit 6ef23b74)
Signed-off-by: Pierre d'Herbemont <pdherbemont@free.fr>

This reverts commit 571cb782.

This was intended for master tree.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 6d4a41a6)

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>
(cherry picked from commit 17a918c9ed964548c11755dbcffe18dd14068b9c)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

It closes #3538 and #3496.
(cherry picked from commit 95f32b1b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked manually from commit cc4676bf)

It is a bit safer.
(cherry picked from commit 0e0eb5aa)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Neither of them support YUV. But GLX is much more likely to work than
FB, and also fails in a safer way.
(cherry picked from commit b660648d)

VLC does not currently handle color masks for ARGB chromas, so this can
not work yet. Instead, fail safe to the GLX output.
(cherry picked from commit 2e2bf09f)

(cherry picked from commit d9fa5194)

(cherry picked from commit e9117abc)

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

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

It fixes #3522.
(cherry picked from commit d50635dd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 897cbb92)

gethostbyname() is not thread-safe.

This patch is not used in Windows. getaddrinfo() requires XP, and
gethostbyname is thread-safe with Winsock.
(cherry picked from commit 9fb933d3)

Conflicts:

	extras/contrib/src/Makefile

Please be more careful when you resolve conflicts! Prior to this patch,
contrib would not build on non-Windows.

inet_ntoa() is not thread-safe (except with Winsock)
(cherry picked from commit ef3e8fb1)

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

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

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

(cherry picked from commit f2865460)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>