It is not limited to win32.

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

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

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

(cherry-picked from commit e0600d460ae60e32b189b79ed61c9dc217577af2)

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

Matroska : Set default compression type for the ContentCompAlgo element to 0 (indicating zlib). Some muxers (for example mkvmerge v4.0.0) do not write ebml elements which correspond to the default values (as defined in the spec).
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

As a side effect, window class names are now uniques (process wide)
allowing to unregister them and so to unload properly the msw vouts.
(cherry picked from commit 6034b5c50ffda54704f8e053a7b0b2a55bddb73d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Dividing an unsigned int by 2 is different from dividing an int by 2

This division was the cause for vlc(Win32) displaying a black screen
when zooming exceeded the display size (alt-'o')

Weirdly, there was no problem for Linux !!?? and also no regression :)
(cherry picked from commit 30efd37a75ab41794a3999cf949a41dcb1c1dc1d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Use currently unused code to sort subtitle lines after they have been loaded.
Closes #3734.
(cherry picked from commit fd7497054b9ee959faa9d18d5bb15a1f5f0268f0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

It should improve the transition.
(cherry picked from commit bbe96d36561c5f3d880291f9f065eda5eb959869)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This is a merge+manual adaptations of numerous commits on Qt4

(cherry picked from commit 99b7cf3c3f0d554bf3175082a32722e78bb0f4e8)
(cherry picked from commit 7e26f748884c337eeafdd55c403c5ebce7e90f80)
(cherry picked from commit 8abd25d4f52c23e6c19f40740e3aaafc385c0e73)
(cherry picked from commit a736053c00778ca35f8653713517558e1e710aea)
(cherry picked from commit 312d9c3fc4dee049bf25288d7a3f519003c817b4)
(cherry picked from commit 6fac93217a965a843046e4c0c814cc161a4e0cc8)
(cherry picked from commit df261c30a4ec89baee1c7b3a1152b846d0bc80a7)
(cherry picked from commit a70095543572745dca9b9ef1c776ed751e76d936)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Now epg-content should update automaticly when user changes channel etc.
(cherry picked from commit f53ff18f969ce5d3cc5f9e844d390ad7898dd05d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit d704a3956c0f6bc3907016544377d81cc27fa5e3)

This fixes an assertion failure whenever --programs is used.
This should also fix a memory leak in the ES output.

This needs testing and backport to 1.1-bugfix.
(cherry picked from commit 034ae114634510d7cdf7fe15e2e76ac34c1a6ddf)

(cherry picked from commit 20141e2c65bd1b5c924943046ec640adc5ec7a4a)

LibVLC needs it.
(cherry picked from commit 12256be1f21c0eeb5aadb69397c50063ba38a088)

Introduced by error by my careless cherry-pick

(cherry picked from commit d933c54212a3a6c5283ea4a93367bc48f9288470)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

Also sort the scripts by file name...
(cherry picked from commit 2c7bfe80014fcad79e7ac969e9b6f6dde77ff2f9)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 560a002fec755c82e219dab8ceedd08dbc8b41c0)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

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

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

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

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

The Fnordlicht-Class implements only parts of the fnordlicht-protocol:
sync, stop, start_bootloader, boot_enter_application and fade_rgb
Have a look at http://github.com/fd0/fnordlicht/raw/master/doc/PROTOCOL
for more details.
Signed-off-by: André Weber <atmo@videolan.org>
(cherry picked from commit c215f7b79628a32373cf0041152cff1a5042d15b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes #3681
(cherry picked from commit 06ed465441b3caefd3aeeb41c62ca321850ec717)

(cherry picked from commit ac795f1a9e032a14b9e09d9a8f44e14de5a0d4cd)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 921fdef8b41457755f2fd9592ccce5660d946c08)

(cherry picked from commit 2dde53c525ed5c9a8d74bb8a85e3ea8ead1dcd11)

Conflicts:

	bin/override.c