This reverts commit 2b7a8683.

This breaks all playlist searching for me.

(cherry picked from commit 959e1e31§)

Conflicts:

    share/http/requests/playlist.xml

macosx: don't use mach_absolute_time() (introduced in 5ead92ff) on PowerPC-based Macs as this breaks the playback of a certain set of AVI and WMV files

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

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

(cherry picked from commit a276d9aa)

Conflicts:

	src/input/input.c

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

Renamed:
 npunix.c to npunix_old.c
 npwin.cpp to npwin_old.cpp

Added new files from mozilla source code
 npunix.c
 npwin.cpp

It fixes at least SVQ1 segfaults.
(cherry picked from commit 07c44496)

References:
https://bugs.gentoo.org/show_bug.cgi?id=261628

Samples:
http://bad-candy.com/candies/fizzymilk/images/badfizz.mov
http://samples.mplayerhq.hu/V-codecs/SVQ1/blue_earth.movSigned-off-by: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

This acutally causes a segfault with the sample xspf files given in #2353 because psz_uri is always NULL when given to input_item_SetURI.
Reported by Aniruddha Shankar <k@191a.net> on https://bugs.gentoo.org/show_bug.cgi?id=261948Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit f2d57a37)

When the socket is congested, we should simply skip sending.
When there is a soft-error, we should resend and simply ignore.

Instead, we were dropping the socket if the failure remained on the
second try, which was always the case in the congestion scenario.
This should fix the socket dropping problem described at:
http://forum.videolan.org/viewtopic.php?f=4&t=56493
(cherry picked from commit 9fdc8915)

(cherry picked from commit 6fa0eee4)

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

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

This reverts commit 826fdf52.

We need to call XInitThreads before anyone tries XOpenDisplay or
something, and XInitThreads itself is not re-entrant, so call it before
we start LibVLC. This only "fixes" Xlib with VLC. Other LibVLC users
need to do something similar themselves. LibVLC cannot do it. Other
application may have already connected to X before it starts LibVLC.
(cherry picked from commit 364868f9)

Conflicts:

	bin/vlc.c
	configure.ac

This was confirmed to fix the problem on Launchpad.
(cherry picked from commit 5dca2e33)

Conflicts:

	modules/video_output/x11/glx.c

(cherry picked from commit a39cf798)

(cherry picked from commit c6d7fc8b)

glXChooseFBConfig always return NULL if there are no adequate configs.
(cherry picked from commit ef48f9b6)

Conflicts:

	modules/video_output/x11/glx.c

(cherry picked from commit 39863326)

Conflicts:

	modules/video_output/x11/glx.c

Fixed audio transcoding when channel mixing or resampling is needed.
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(transcoding cannot be worse than it is now)

(cherry picked from commit af4d8375)

(see http://forum.videolan.org/viewtopic.php?f=2&t=56224&p=186350)
(cherry picked from commit 575b1c1c)

(cherry picked from commit 58469fda)

Trax, close #1851.

Manual backport of [0ba671da]

Change wording to be more accurate.

And maybe make JB happy.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit f03b31ee)

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

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
(cherry picked from commit b632da4e)

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
(cherry picked from commit 51d3696e)

Conflicts:

	modules/control/telnet.c