... else the option is useless since nobody will think of enabling it.
(cherry picked from commit 02aeb3ca)

(cherry picked from commit 538b14f9)

Add a variable to force which .pc to use
add libxul (aka xulrunner 1.9) before iceape-plugin and xulrunner-plugin (xul 1.8)
Don't depends on mozilla-config.h when using pkg-config. It's the old way
of doing thing and requires us to depends on the foo-xpcom.pc

Needs backporting once tested
(cherry picked from commit 26c5015f)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit 9463913f)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

(cherry picked from commit cdc8bcd3)

Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit 5a16baa2)

Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit 58b66d49)

This is a support to statically link jpeg plugin on windows to the plugin in order to make Qt read jpeg files (needed for album art).
This of course, will increase the binary size, but since dionoea is lazy and doesn't want to make easily conversion from jpeg to png|xpm|bmp, here we go. :D
Better solution should be found on master.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

To be back-ported
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

If the TS demux signals initial page 100, then this inital page is likely NOT the subtitle page. Since we can only really handle subtitles, let the teletext decoder figure out which pages are subtitles on its own.

Per request of Marian Durkovic
(cherry picked from commit 1bc06496)

(cherry picked from commit f389f376)

zvbi: Added a table with language -> zvbi default_region mappings. Far from perfect, but will solve some cases.
(cherry picked from commit 718739e9)

(cherry picked from commit 3f4a6a8f)

(cherry picked from commit 628a18b6)

The user aspect ratio and resize will still be lost on an AR aspect ratio change.
(we may want to keep at least the requested resie).
(cherry picked from commit 3065dd7b)

Fix build with libavcodec 52: few renamings, the way to specify trellis quantization has changed. error_resilience has been renamed to error_recognition; I've left the option named ffmpeg-error-resilience since I am not sure if it is worth renaming the option here.
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
(cherry picked from commit fa68d1ae)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

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

Sorry, I forgot 2 files.
(cherry picked from commit 3ddc0024)

(cherry picked from commit 02184fcd)

(and don't forgot to release object when an error occure)
(cherry picked from commit 83ec2a0e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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

In fact Qt uses always / as a separator, so introduce a function named toNativeSeparator (inspired from QDir) to fix this on Win$uck$

(cherry picked from commit 90d15c42)

Remove C musicbrainz modules, use the new XML musicbrainz API.
This removes VLC's dependency on libmusicbrainz. Consider backporting
this commit and the previous one to 0.9-bugfix to get musicbrainz
support on windows.
(cherry picked from commit 950caf17)