(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)

This seems a lot, but 65k definitively ain't enough for some
movies.
(cherry picked from commit 89dbfd78)
Signed-off-by: Jean-Philippe André <jpeg@videolan.org>

(cherry picked from commit a1ad2378)
Signed-off-by: Jean-Philippe André <jpeg@videolan.org>

Since 6bb9f299 (or master/1834c5a7) it was not possible to load
luahttp using this shortcut anyway.
(cherry picked from commit 4d429b61)
Signed-off-by: Jean-Philippe André <jpeg@videolan.org>

(cherry picked from commit 8078a54f)

Which was wrong way anyway.
(cherry picked from commit b986c067)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

also fix sub 720p defaults
(cherry picked from commit 16ea0e63)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

We don't want that anymore anyway
(cherry picked from commit db60e23c)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

We parse the additional HTML5 section too, the only place where the
WebM formats are listed. If the URL contains "&html5=True", the WebM
formats are preferred, when available.
(cherry picked from commit f18b314b)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

This also saves one HTTP redirect
(cherry picked from commit 09b6b8e3)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

VP8/webm profile defaults to 720p, which could be reasonable default imo.
Not sure if people want to it to default to same resolution as input is.
(cherry picked from commit e8b350df)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

First priority is file-extension user gives, if that isn't
specified, use mux-value and if that's not valid (eg mp4), fallback
to flv-muxing.
(cherry picked from commit 9aba558d)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

Doesn't allow mp4-muxer on other than file-output (doesn't check rtp atm).
Also tries to be littlebit clever and cleanup sout-mrl.
(cherry picked from commit b46a8cb9)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>