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

Conflicts:
	contrib/src/speexdsp/rules.mak

(cherry picked from commit af3eeea5af09938d1f90c46f048137156c531327)

(cherry picked from commit 88ab8def21e117704335a800cfbe5e08baf1edd7)

(cherry picked from commit fb63f1cc675c5302628ad2fec033ac2472107085)

This ensures that subpictures blending works, and avoids copying back
video frames from GPU to CPU. For proper hardware acceleration,
use libvlc_media_player_set_xwindow() instead.

(cherry picked from commit 86796e2a57adcf5daea9d182c4378e49b40a7f47)

(cherry picked from commit e8ab8fb6b40d315632da311de7a2e03002a528c5)

(cherry picked from commit dbdd63484c7e8bed853e4f2b398c906df181be3a)

Pointed-out-by: Paweł Stankowski
(cherry picked from commit 34fef72dab6f7718370dbe27a66f320362475198)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit fd1e287a11d678a8e131d59979e84fb4486c0c57)

(cherry picked from commit 47431e192bbaefe723c7b6915a54f3ab4ca440e8)

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

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

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

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