(cherry picked from commit 43563679)

(cherry picked from commit 1b00b4a7)

(cherry picked from commit e1b1237c)

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

Usage: http://localhost:8080/art?item=1234
(cherry picked from commit 47a9b990)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit ca0752e4)

macosx: make sure that VLC always shows a visibible video window when spawning a new vout (close #6418)
(cherry picked from commit 8b06a658)

macosx: make sure that the subtitles menu item is correctly updated on playlist item change (close #6342)
(cherry picked from commit 4ea48984)

Ref #6544
(cherry picked from commit 69030f11)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 6b7628d8)

macosx: resize time field in the detached video window to make enough room for runtimes longer than 1 hour (close #6445)
(cherry picked from commit 4a75f8a8)

Conflicts:

	extras/package/macosx/Resources/English.lproj/MainMenu.xib

(cherry picked from commit a8fad676)

5a2390a7 is the first bad commit
commit 5a2390a7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date:   Sat Mar 31 22:20:58 2012 +0200
(cherry picked from commit 0041fd5c)

Close #6242
(cherry picked from commit 527d3507)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #6544
(cherry picked from commit 0585f023)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

And close #6536
(cherry picked from commit 5a2390a7)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

VLC crashed when mounting multiple volumes at once
(cherry picked from commit 35e8ad40)

Conflicts:

	modules/gui/macosx/open.m
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

It is supposed to be a bit less slow
(cherry picked from commit 6dbd403b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Close #6447
(cherry picked from commit 7641dadb21bf0e60ea99c092caa1dcf3fca257c6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 01985075405e84ba650bbed85721c95f2042d04a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Please don't hide bugs.
(cherry picked from commit 8cecb7ac)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Important code changes were done by Orange
(cherry picked from commit be96451c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

According to http://www.mp4ra.org/object.html (not tested)
(cherry picked from commit 3d96a1ab)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Close #6501 and #6469

This is not exactly a backport from trunk, since this is less
aggressive.

Close #6504 #6510 and #6511
(cherry picked from commit 58a99f2a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #6514
(cherry picked from commit 600d2090)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

I am not sure this filter ever worked as intended.
It was providing serious distortions.

This is now limiting seriously the space of parameters but at least it
does not explode anymore. Should close #4887
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit be8542ad)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #6489
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 885391aa)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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