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

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

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

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

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

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

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

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

(cherry picked from commit 98682b66af497c2a038011aae227fbd13511167a)

This is necessary for compatibility with C++. The keyword is only
meaningful in definition, not in declaration anyway.

(cherry picked from commit 1a4dc0bd85d94c9ad0b50268aed009840bf2d30e)

Conflicts:
	include/vlc_tls.h

The "libvlc_MediaListPlayerPlayed" event was defined but unused.
It is now fired when libvlc_media_list_player is played until last item in the playlist
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit fd4a0ba83493bd91f2adb7b68ae9fb3c3d5fc972)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Else, it conflicts with Win32 patch and fails to compile

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

ogg was still being pulled in as a dependency when cross-compiling, which
would break certain build configurations.

(cherry picked from commit 4c63aa1192dc4148b8c540b0b7210aa91713505b)

(cherry picked from commit 6500f61ed6f6f8525961fab89d2a69bb0172434a)

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

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

The core cannot blend subpictures to hardware surfaces. In principles,
blending could be performed post chroma conversion, but this is not
supported by the video output wrapper so far.

(cherry picked from commit 47d7b5c0537f16a99ee224c2c75f4f41dd18415d)

That should help failing safe to software decoding if the graphic card
has too little free memory. Old cards with only 256 MiB are commonly
affected by that problem.

(cherry picked from commit f6da7e32f09d9671e92d90d98b7a2c51c28290b5)

Conflicts:
	modules/hw/vdpau/avcodec.c

(cherry picked from commit 5bf47e957dfb794dfb96acb9c928fc8d87205d35)

(cherry picked from commit 8c32482683f4e2ac0f920e10142835766bea599c)

This seems necessary to maintain the mapping of libav's packet stream
index to the VLC plugin's tracks table offset.

(cherry picked from commit 6e800f09423c6e9dc28d2fef9296ae4b25bddb26)

(cherry picked from commit 97ef3628415ece0ee2931e70cab424d5446eb64b)

(cherry picked from commit 8ac5cc821f0a976c32885d56d33d2e358f776414)

(cherry picked from commit 0361af77c96214ce04257fe843e6bf31a05f4ad4)

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

Pngcrushed graphics.
close #11101
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

(cherry picked from commit f83c0330b3b5c392626c486bb83a2ba0b38ad4a8)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

Refs #11752

(cherry picked from commit ce6092e13fad46e834e3808e849ad259678e25b1)

awakeFromNib is no longer called on fspanel (as there is no nib anymore), so don't rely on it

(cherry picked from commit 51d5f1efb0e77d254d3754c6cf5f6a9856365c52)

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

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

Regular streams skip if p_read is NULL.

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

(cherry picked from commit 033cdd9009df398c3fedffd8b5c31655f60256e4)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Refs #12298

(cherry picked from commit 9ab9aa37080ed6e8d34717bdf416509c7e38bbf9)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Installed version cannot find lua scripts.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit ff7f5020e7fad15ee8a277aab5f02bef515f3812)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

For playlist-autostart, PLAYLIST_PLAY is used now which does not restart
the current item if there is already one running.

This avoids restart of the same item in a quick succession, and thus
workarounds the issue described in refs #11488.

(cherry picked from commit e6dfd01f3dc2ff7b34006d214e57524f82e5ccd6)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

refs #12283

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

The "```" case could also never happen as this is the
decoding of value 0 which should map to mac.

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