(cherry picked from commit e8df55c4)

macosx: changed the data appearance in the info panel to the following behaviour: if playlist is collapsed, we show data about the currently playing item. if the playlist is shown, we show data about the current selection in the list, regardless of the current item.

Empty selections in the playlist are still not allowed, as this would lead to some trouble I don't want to solve for this old panel (to be fixed once the dudiak branch is merged)

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

I am not sure that the reverted part was really intented.
Reported by Jonathan Brossard, iViZ Techno Solutions Pvt. Ltd.
(cherry picked from commit c84de2ba)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

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

Initial patch by Hannes Domani with the comments:
"Hello

 this fixes the problem when font is not attached in mkv.

 was mentioned in:
 http://forum.videolan.org/viewtopic.php?f=14&t=51096&p=166340
 http://forum.videolan.org/viewtopic.php?f=7&t=50534&p=163900
"
(cherry picked from commit afec80a7)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 81dc2e72)

Conflicts:

	modules/gui/qt4/dialogs/sout.cpp

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

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

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

(cherry picked from commit 13b8ebc1)

At the moment, we assume RTP/RTCP multiplexing anyhow.
(cherry picked from commit 21191c27)

thou getURI should return valid uri anyway. So this is kinda hack anyway.

location nodes on track.

Use last location-node for uri (maybe first would be better instead ?).

check that input_item_NewExt doesn't return NULL

should fix ticket #2353

that can be in url without encoding, \ doesnt seem to be one of them)

relates to ticket #2218

(cherry picked from commit fd0cff6a)

Conflicts:

	modules/access/dvdnav.c

Ogg can be now: ogx, ogv, oga but we have to keep ogg and ogm for backward compatibility.
(cherry picked from commit 16f240f8)

Conflicts:

	include/vlc_interface.h
Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Backported [688d48fe] and [68a19d04]

Due to VLC's API changes, no cherry-picks were possible for these commits

(cherry picked from commit e94ab021)

Otherwise, if the interface is hidden behind another window, clicking
the tray icon however many times will request user attention in the task
bar and never actually show the interface. This was confusing and
inconvenient (fixes #2396). This new behavior is consistent with KMail.

It would probably be even better to show the interface on top (instead
of hiding it, then show it on the second click). Unfortunately, while it
does seem possible, I do not know how. For sure, the previous scheme did
not work anyway.
(cherry picked from commit 96db483a)

Otherwise the receiver would -in principle- try to receive RTP on the
next (plus one) even port, whereas the m= line port would be used for
RTCP. We could also pass a=rtcp for the normal even/RTP & odd/RTCP
ports setup, but that can only confuse receivers with no gain.

Note that receivers may not parse the a=rtcp parameter in any case. In
fact, VLC does not parse the a=rtcp field to this day. In any case,
sending RTP to an *even* port is the only safely interoperable option.
(cherry picked from commit ca15fe09)

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

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

macosx: display only information on the currently playing item instead of the item selected in the playlist

(cherry picked from commit aa835660)