(cherry picked from commit 4c09ad19963e3940e2ef3be43843d4902afebcd7)

(cherry picked from commit 337aaf7c1ff706467c2c8e3abafff58263277b5b)

(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 03ad78e9e4799fe3ff713b9b37ec521f7ffb61fd)

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 09aae32b04734a520c0087fe12af8deab518bd7d)

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

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 7bb775484f81f6f848662103355089c191a960d1)

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

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

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

(cherry picked from commit c789f858d4a31d65be4af4866573e81ae0bc543d)

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

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

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

(cherry picked from commit 298ca276a1149034447bd32d9230450a904d33d2)

(cherry picked from commit 127ae211fb7c9d21d4d6f3f73fde76e05e98b6f1)

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

CVE-2011-3048 (serious vulnerability)
(cherry picked from commit efeb2e712313a988743307bea766edac2d748d78)
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 a4a14d8bce9ef70ca4a85a6cdcb5d41643db0b6e)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>