(cherry picked from commit e16774656a1e7abc526d1ac0d37755fd38a3e496)

(cherry picked from commit 470ccf4d276b59879a59663082f13e4c0dd78708)

(cherry picked from commit 815b2ce8389f038c12552b26df59fea67a96ad43)

macosx: added 'subsdelay' to the track synchro panel and removed the bogus, non HIG-compliant plus and minux buttons
(cherry picked from commit 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b)

(cherry picked from commit 03ad78e9)

macosx: implemented drag & drop from playlist to media library and vice verca. additionally, drag from SD to ML or PL is supported. (close #6044)
(cherry picked from commit 09aae32b)

macosx: removed VLCControllerView, which was superseeded by VLBrushedMetalImageView and VLCThreePartDropView
(cherry picked from commit 84e84d3f)

macosx: refuse file drops on the playlist table if the current root item is neither the local playlist nor the media library
(cherry picked from commit 7bb77548)

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

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

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

(cherry picked from commit c789f858)

Conflicts:

	modules/gui/macosx/open.m

vout_macosx: re-write VOUT_DISPLAY_CHANGE_FULLSCREEN the way it was intended and update the display size correctly, so we get sharp OSD rendering
(cherry picked from commit 4a10b45f)

macosx: fixed appearance issue when collapsing / expanding the playlist while it is empty (close #6382)
(cherry picked from commit a80d58fe)

macosx: set a sane minimum size for the advanced prefs window, so the options remain useable (close #5994)
(cherry picked from commit 219dd45d)

(cherry picked from commit 298ca276)

(cherry picked from commit 127ae211)

(cherry picked from commit 8687ceac)

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

Close #6337
(cherry picked from commit 28a17b3a)
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 457fda26)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit f325462b)

(cherry picked from commit 6cbf48f1)

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

(cherry picked from commit 25cf83bc)

This restores compatibility with 1.1 command lines and docs

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

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

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

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

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

It can even crash Qt interface
(cherry picked from commit 71a82406)
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>