(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 f8d56527)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Manual backport of c1cf203b

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 5a4a1bc2)
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 9381877a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit f2366bdd)
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 d0606472)
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 a0530f4a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit 532e5d01)
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 1f253df8)

Signed-off-by: Laurent Aimar <fenrir@videolan.org>
(cherry picked from commit a4f30ff9)
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 7b27f950)
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 84f1839b)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 47369283)

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

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

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

(cherry picked from commit 8970ff6d)
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 e043658d)
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 2e298fb8)

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 a9d91672)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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