(cherry picked from commit 2b67ce72a9cbf2279bf8f6f769984aca968fe1f6)

(cherry picked from commit cc856b0f652a65dba308025ef3502abea1534d25)

(cherry picked from commit 806169e33a349d5ccd2a7c42eceeeaab8e154281)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

... and make user experience with skins2 less frightening !

missing files in skins should never occur, but reality is quite different
(see vlc skins website). Yet, if a check is done before any other processing,
we can avoid the unfriendly error dialog boxes issued by vlc core, and those
skins often end up quite usable (missing files are either no longer used or
for ancillary functionalities, that go unnoticed)
(cherry picked from commit 3b35ca6d42b294a614a790032c24987a44a8c3c1)

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

We already use pkg-config in configure for the fist part
(cherry picked from commit a985ebd5cc1c73f885eb663707cb3daa995bdc29)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit b35dc178d7d159a850ace7baec714c5759e40908)

Conflicts:

	configure.ac

(cherry picked from commit 964c7e91c0273447e3f830c9aec4d84d602851b9)

(cherry picked from commit a81518d6c9f960b92fcafb24855398600c0765ee)

Conflicts:

	configure.ac

Signed-off-by: Laurent Aimar <fenrir@videolan.org>
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit e575df71f59dcc2d9ce7c694ed5fb2b1d307e0ec)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

From http://bugs.gentoo.org/show_bug.cgi?id=328969Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 4332f5b4071f1cf3f459b3883e1fa1a11c0e58c2)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit f8d5652706916e4b7471a6d40f0d1c23854a79a4)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Manual backport of c1cf203b27210576125cb7f23df93804c4598b39

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

and fix a sentence

Seriously, FFmpeg is way better and free...
(cherry picked from commit 5a4a1bc22725d5639afe9192973952afec49b832)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

It fixes a segfault when the directx/direct3d device is lost at the wrong time
or cannot be restored soon enough (close #3647).
(cherry picked from commit 9381877a72a850aa13051a91a1e86938e19b3cac)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

IDirectDrawSurface2_UpdateOverlay may fails, in which case vlc should simply
retry later.
(cherry picked from commit d0606472d5a245ec89846d091f5280e51874ed96)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

There is a little difference in Direct3DLockSurface as it now also
sets the height field, but it should have no functionnal changes.
(cherry picked from commit a0530f4ab42c5e9dbd1b21e5a44c95d208254c55)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 8e6a4513d42bc602f5cb9f56c6a79299b60056e2)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit dc4b98a9646e9cfa00d66a894e0aeadf59f03643)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 532e5d01d788f9c161065321e7ffa057e0041df4)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

get the SD video (in flv), the HD and HQ videos (in mp4) causes seeking
back and forth and the video is unplayable
(cherry picked from commit e778af8b)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Do not try to delete a callback and/or a mutex that do not exist.
The goto error paths still look a bit suspicious, someone should
double check them.
(cherry picked from commit 1f253df8acc7f2c249c1aae2ba44cae2020a45f7)

Signed-off-by: Laurent Aimar <fenrir@videolan.org>
(cherry picked from commit a4f30ff9f74a205f9ad39fd5c76fbda32d064771)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 3683cc99da0a39bca72d14a17682ffeacee7652b)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 7b27f950b0fe4c76acbea58ea183a486bdc7da2e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

We now test that the selected fourcc actually works by calling vaGetImage.
Initial patch from Gwenole Beauchesne.
(cherry picked from commit 84f1839b2318ac0963bc37d43b078d5992e9e8db)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 47369283f9bed68db77e0f1ba1f11840ddf1bfb3)

This was fixed after 1.1.0-RC.
(cherry picked from commit 617801b6877e3aac9651eaa15e9ee0d2aea564d8)

(cherry picked from commit 216818a84e81e8332f74a93513c249d63beee444)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit 1f5e1e827fffcb075d196faffced40eee2df8c08)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

(cherry picked from commit 8970ff6d495ee362098545b8f4a075ebda5d8099)
Signed-off-by: Konstantin Pavlov <thresh@altlinux.org>