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

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

(cherry-picked from commit e0600d46)

(cherry picked from commit 2c383bfc)
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 91663977)
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 6034b5c5)
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 30efd37a)
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 fd749705)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

(cherry picked from commit 99b7cf3c)
(cherry picked from commit 7e26f748)
(cherry picked from commit 8abd25d4)
(cherry picked from commit a736053c)
(cherry picked from commit 312d9c3f)
(cherry picked from commit 6fac9321)
(cherry picked from commit df261c30)
(cherry picked from commit a7009554)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit d704a395)

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 034ae114)

(cherry picked from commit 20141e2c)

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

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

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

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

(cherry picked from commit 921fdef8)

(cherry picked from commit 2dde53c5)

Conflicts:

	bin/override.c

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

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

(cherry picked from commit ae2c9e4f)