(cherry picked from commit 96f5cc4d)

(cherry picked from commit 12cf82c8)

(cherry picked from commit a427e327)

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

(cherry picked from commit 0772c250)

(cherry picked from commit 56ddc63b)

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

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

getaddrinfo() may list IPv4 before IPv6 depending on system
configuration.
(cherry picked from commit e5454831)

(cherry picked from commit 2c5de8fc)

(cherry picked from commit 84fe2cd5)

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

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

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

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

mpeg1 files may have only one sequence header.

It can be backported to 1.0 only after being carefully tested.
(cherry picked from commit 4746e4bc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

It allows to use direct rendering if the chroma/size changes.
It also avoid *always* disabling it after a seek...
(It cost about 6% of CPU for video HD on my dual core in memcpy).
(cherry picked from commit 0f79a0a0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Decrease poll delay from 0.5 to 0.01 seconds in alsa in oss, else the
audio input would block the video input when used as an input slave.
Other accesses likely to be used as input slaves might need to be
changed. An easier solution (module-wise, harder core wise) would be to
run each slave in its own thread.
(cherry picked from commit 3d9fc421)

(cherry picked from commit a8820e3e)

Conflicts:

	src/input/input.c

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

(cherry picked from commit 97c42d97)

(cherry picked from commit a9ded8f3)

macosx: prevent a locked-up UI state when using the date field by removeing the unused NSDataFormatter

(cherry picked from commit b8aa5b46)

Backporting because bored of explaining it on the forum.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

kO -> ko, kO/s -> kb/s
Once again, since apparently it was mistakenly overwritten

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

(cherry picked from commit a9aa82f3)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 564cbe7b)

Conflicts:

	modules/demux/playlist/itml.c

(cherry picked from commit 37e54c44)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

(cherry picked from commit c6ddd1d1)