(cherry picked from commit 1b00b4a7cdfe9fa9bc576f0df396a432e7f840c1)

(cherry picked from commit e1b1237c58718193bd74a198294be8d2de3b8625)

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

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

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

(cherry picked from commit ca0752e4ff27c29b63f95f579378a4c1fa983488)

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

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

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

(cherry picked from commit 6b7628d8e4512631ff1cf3a6d00e147ac2ecbfba)

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 4a75f8a8a27393ee16faf285fd68d9c17475b59c)

Conflicts:

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

(cherry picked from commit a8fad6766cbc27471f494a5e176112f40516054a)

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

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

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

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

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

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

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 6dbd403bac9fa159b71cf66768dd61278ce5a370)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 4105ebb57dda9350ef0dcb23089146c9af79857c)
(cherry picked from commit a6d52f6fa7a1f62d29fac153f486156134d9ff86)
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 8cecb7ac15fa6313d27b2a7a1cf27287299014bb)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit 2525785d059209ceebe296228af4a76d9d20f81d)
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 3d96a1aba6b31f1b0a70805989105073d24f5f43)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit f6dd8d2f62f14ce6fd03e7f642113efba1ab060d)
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 58a99f2a7c820d86c39a126ccd9db104156966d6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Ref #4887
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit d787a15aeef5a79e18fdfd8e16118b7c2df37fbf)
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 be8542ade356de4fa218b03df22747182bcbe9a0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Fix decoding of some DTS in mp4
(cherry picked from commit dc954ca43c9aebeea028144e251bc3db9f53423a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>