(cherry picked from commit 8687ceac8e0c7fda373188ff5e29e704993370a2)

No sense to display chapter buttons with 1title&1chapter
(cherry picked from commit 2059bea41c0ea723466ccbb3e9d9550b26e2e2ee)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

The parsing is not complete enough to be on by default.
http-use-IE-proxy option was removed in ac40aef7

Should close/delay #5782
(cherry picked from commit 457fda26b42a7a6cbc9d6149cc53e92979ace83d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit f325462b082c9cecda54b4d9dc68f43e046cefcf)

(cherry picked from commit 6cbf48f1f9c38c1a0ed91fb6699f977b3b7f97ea)

macosx: prevent a crash by stopping the current input when changing the 'video embedded' variable (close #6063)
(cherry picked from commit de93266466b9d96b9fa3df9c66db1df93f3cebf4)

(cherry picked from commit 25cf83bcace12d19b4980140037096a0b57bcd87)

This restores compatibility with 1.1 command lines and docs

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

Should close #6570
(cherry picked from commit 7f807d9bb7cb08f1401d5cbec472338ed1d38157)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Unlike POLLERR, POLLHUP, and POLLNVAL, POLLRDHUP is not set by default.
See http://man7.org/linux/man-pages/man2/poll.2.htmlSigned-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit c0e768b8fd8e6405a3864db3b2358c1ccd89a476)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 44b34340a6d2d3b94f4260ad80e080b94fd18b3b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

It can even crash Qt interface
(cherry picked from commit 71a82406e23055bddbe1f9a2f3f31efd1df63938)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

CVE-2011-3048 (serious vulnerability)
(cherry picked from commit efeb2e71)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This is not manageable.
After the black screens, as reproduced by Rémi, (fixed I hope)
After the grey stripes, (fixed too, I think with DevCaps2)
There is still:
 - the yellow middle stripe, with failing IDirect3DDevice9::StretchRect
 - the subtitle blending issue, with absolutly no messages #6542

We have enough to do with the delayed pictures not displayed, in case of
subtitles and the broken audio in so many situations (not to mention the
volume delay...)

(cherry picked from commit a4a14d8b)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

A lot of releases have subtitles in subs/ subfolder
(cherry picked from commit 2f35b870)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

This was not correctly saving the last opened folder with some encoding
(cherry picked from commit 0fe06bc3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Reported by Marcin 'Icewall' Noga from Hispasec
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit e6003756)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #6415

Reported by Marcin 'Icewall' Noga from Hispasec
(cherry picked from commit bb222c8a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Reported by Marcin 'Icewall' Noga from Hispasec
(cherry picked from commit 83db4181)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(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 8b06a658de60f18809b4282baa6f216333456495)

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