(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 e778af8bb60ba6a67c47e8b30c175874726414ee)
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 3683cc99)
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>

If 0.8.8 is detected and --enable-mod is passed, it will error,
if --disable-mod is passed, nothing will happen
else it will autodetect. This is mostly like all other PKG_ENABLE_MODULES_VLC
detections
(cherry picked from commit e043658db0f93148d2a3e499cd90e6fb76ee3fd2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

fullscreen is now managed (activation and deactivation) in skins2
 exactly as it is done in qt4.
    - activation when a VOUT_WINDOW_SETFULLSCREEN is received
    - deactivation when (and only when) a vout_window release is received.
(cherry picked from commit 2e298fb87562b7a6470c24091a336b251be64bc4)

This was annoying because if you had a modplug.pc and didn't --enable-mod, it was auto-detected and then failed.
(cherry picked from commit a9d916728b2717206a0a7fe0702b0bc6dad16747)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Should fix #3767
(cherry picked from commit 202c4d9c4fab9bf3391c887194d4f05999634d61)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

The current code seems to require _all_ metadata fields to be populated
which seems a bit unreasonable.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 7d9488cf0055fb8baf3b1d619d30824e7f8c4a10)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>