(cherry picked from commit 24bacb28)

1) Every Human Interface Guideline on Unix/Linux/Windows reserves alt key for menu and button accessibility... Try to NOT use those...
Moreover, you have NO idea how the translators are going to translate your accelerators...

On the other hand, with this long list of keys it was become more than difficult... I'll document on the wiki.

2) Use keys next-to-each-other like-a-cross for cropping

Those keys are making a cross in most layouts ( on the contrary to the previous ones).

3) At the same time, use easier snapshot key. (shift+s is easier than Ctrl+alt+s)

4) Comment previous changes and remove whitespace.

Nota Bene:
I have no idea on how are the default on the mac and if the are conflicts there too, so I won't make changes there.

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

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

(cherry picked from commit 90199a69)

... 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>