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

(cherry picked from commit 374338c3)
(cherry picked from commit 9beed2d7)

(cherry picked from commit a6b0ee0b)

10L

And unhibit before quiting
(cherry picked from commit af7d0050)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

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

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

Whether this works depends on the stream and demux behaviour. There may
be a better way to fix this.
(cherry picked from commit f7b081e5)

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

from fdb990bd.
Spotted by Laurent.
(cherry picked from commit a969b13d)

(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