Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 28fd4de9)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

This should not be forwardported, in master all URIs should be URIs.

It's either paths or uris.
(cherry picked from commit 6148ec64)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

This fixes using marq and rss filter with default options on Mac OS X.
(cherry picked from commit 770f625a)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

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

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

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

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

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

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

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

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

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

The string given in a callback must be copied.
(cherry picked from commit 1446509e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

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

(cherry picked from commit 1f8124f6)

Conflicts:

	modules/video_filter/postproc.c

When we connect through a proxy, the certificate common name does not
match the TCP-level hostname...
(cherry picked from commit 02c05f00)

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

Set the nop at the end of parsing, instead of the beginning, because SetURI will only init the name once. Now we had all media library items with the title "nop".
(cherry picked from commit fffd3cd1)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

Don't ignore DTS in wav.
(cherry picked from commit 483cdd60)
(cherry picked from commit dbb13499)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

A <track> can have 0 or more <location> elements. VLC doesn't like elements without a uri however, so init an element with vlc://nop. Note also that we currently only support 1 location element per track....

This closes #2891
(cherry picked from commit 7c224751)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

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

This ensure consistency with simple Open.
Moreover, with those KDE effects, this is cool.
(cherry picked from commit d2bf9548)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #2851

(cherry picked from commit c1c69332)

(Rtp)Add then MuxAdd, so MuxDel before (Rtp)Del. Indeed, the PS muxer
sends packets when it's deleted, so the RTP stream is still needed.
(cherry picked from commit 816f5573)

(cherry picked from commit 6bf70b22)

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

Select fullscreen display the one that has most of the video-window,
then you get qt4 fullscreencontroller on same display also, and it's
more logical (imo). Algorithm is prettymuch the same as Nigel Tao has
made in his gpl2 project superswitcher, Didn't want to reinvent this
with different variable-names ;)

It now will handle both paths and URIs when trying to determine the filename.
This balances [873234a1].