This fixes the following error,

In file included from ../../../include/vlc_stream.h:27,
                 from ../../../include/vlc_demux.h:33,
                 from mkv.hpp:55,
                 from demux.hpp:28,
                 from virtual_segment.cpp:27:
../../../include/vlc_block.h:138: error: 'ssize_t' has not been declared
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 248812582798e57d8da527095fe29d4b3df75ad4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Using it causes libdvdnav to complain about 'demux error'.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit bdf3c466d2212343667f5cda1bce3938d17471cd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This reverts commit 60296be1.

(cherry picked from commit c495d676f112fa09f12dcfddc6b1f2f38d3032d9)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

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

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

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

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

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

Files were copied to contrib/src/src instead of contrib/src...
(cherry picked from commit 49399c2720db101476aed2014c58444929357e19)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Close #6275
Close LP:943014
(cherry picked from commit 2eba8b99b7b7b5c64041d374718ce3d7ff17a0b8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 93b211422cf7fa0c7e61c355da2068e7e0e56a69)

(cherry picked from commit e6f14b002b2232794d9dfc4a2841d2ea1df2241f)

macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)
(cherry picked from commit 566b0cd4405f9c9022789ce43c86ec5ee4753acf)

(cherry picked from commit aff835014cd769596220b56248fecda8bf196f29)

(cherry picked from commit 1e952e5ee6cfd2e0479a6589802234c46e65d2f0)

(cherry picked from commit 5d6ac80bae137c6b36730a4fe82841ef3eec0099)

vlc_memalign data should be vlc_free'd

Close #6114 #6280
(cherry picked from commit 35d2292855c399fcbcc5ef6116580db2350060f7)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Notably for libavcodec
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 55295e3dcef97dc06659a58aeb7cf97022e92dfb)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

huge numbers of memory leaks happens because subpictures are not deleted.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 06430f7c2468d5f8004bad8c7ff146d5a1dcebbb)

(cherry picked from commit 3e48c330dccfb4d90e0b3d97308038b6de3b570b)

Conflicts:

	configure.ac

This reverts commit 7711eb75851df0dfcacecab5199bec5cff528ce8.
This makes no sense as control types are _not_ macros.
(cherry picked from commit 74ba8ca7521d0dd984db899b7517e89a8737bc8d)

setLevel: seems to be not thread-safe, therefore we set this on the main thread to ensure its functionality
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit e33b79f2f7d90dedae32adad27e4c452a8ec278a)

For nonembedded mode, this makes sure that:
- playlist window can be closed and video continues playing
- video will be stopped when closing video window with Cmd+W

Close #6239
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit cf461cc05b82b45499f368f1a19944e6051fc91b)

With this patch, the window has the proper inactive state when another window is in foreground

Close #6016
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 6e78f7b4d206c2d76b2d09e953383f0150cd051f)

(cherry picked from commit 407c1ad8ffe2ed50441f91f4a0b23b558bbafcae)
Signed-off-by: Rafaël Carré <funman@videolan.org>