(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

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

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

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

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

(cherry picked from commit 8078a54f2c4365bf7f94a81fe0a0fd61a574cca1)

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

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

We don't want that anymore anyway
(cherry picked from commit db60e23c082afbfbd8bc205aba89a1ad23c4879e)
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 f18b314bd2e6059e73fbc4dc18000c18aa6e4535)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

This also saves one HTTP redirect
(cherry picked from commit 09b6b8e32fe1e46e1f69d8dec0df29975a83f649)
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 e8b350df4f1985fab19f797f0fb926c21bff18b8)
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 9aba558dbc3441a9f96eca41fe823e84907bc2d4)
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 b46a8cb9e596cc5d0b69480cb374d382cdc46b90)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>