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

rtp-output without muxin doesn't seem to handle that delay.

if user defines qp-value, CQP-mode is used
otherwise if user defines vb=0, CRF-mode is used
otherwise ABR-mode is used

Also set vbv-bufsize if user didn't specify them.
bufsize is bitrate * seconds between keyframes instead of earlier
2*bitrate. Recommended by Dark_Shikari

So now you can stream for mobiles with following:
 sout="#transcode{deinterlace,acodec=mp4a,vcodec=h264,width=320,height=180,venc=x264{no-cabac,bframes=0,ref=3,level=12,keyint=50},vb=180,ab=64,channels=2}...

tested with rtp-output and G1 android. Produces quite stable near cbr
stream.

And file-encoding should be ok with defaults (without any
venc=x264-settings or bitrates), if not targeted to
handhelds/streaming.

(cherry-picked from 9543a6ab)

Also default qp=-1 so CQP-mode is only used when user defines qp-value

(cherry picked from commit cce5f9e2)

a30ec4a2)

(cherry picked from commit 1b7c1d35)

When second argument of a for statement is a sequence,
firsts expressions are evaluated as void with no usage
of their return value.
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 16bc4dd9)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Apparently, since 'setlocale( LC_NUMERIC, "C" );' was removed from
libvlc initialization 3 years ago, the syntax to set configuration
variables of floating point types has changed and become dependent
on the current locale ("0.5" vs. "0,5" etc). Some places have been
converted to the use of us_atof() which is locale-independent; fix
all the remaining ones too.

Arial Black is available on all Mac OS X installations current VLC releases can run on and is the default for the 'Quartztext' renderer anyway.

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

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

Reported by Sebastian Apelt, Siberas.
(cherry picked from commit dfe7084e)

Reported by Sebastian Apelt, Siberas.
(cherry picked from commit c5b02d01)

Reported by Sebastian Apelt, Siberas.
(cherry picked from commit 861e374d)

(cherry picked from commit 5e2c4b1a)

(cherry picked from commit 6fc6b16d)

(cherry picked from commit 475b627e)

Info they provide is typically also present in the text or
not usefull to VLC.
(cherry picked from commit 23561729)

(cherry picked from commit be9458e0)

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

The avcodec module can be successfully opened to encode subtitle formats
that it recognizes, but support is absent and pf_encode_sub is never
set, which leads to a crash.
(cherry picked from commit 2631cc77)

This piece of code really ought to be fixed better than that
(cherry picked from commit ce484549)

Fix interlacing support with default chromas too
(cherry picked from commit eb9b54c8)

First try using no interlacing and fallback to driver's default if it
isn't possible. Might fix some issues. We still need to declare images
as interlaced to VLC afterwards, but that's another problem.
(cherry picked from commit b5bcf711)

Fixes some incomplete reads with gspca driver, and makes it possible to use all 3 data acquisition methods (previous code was limited to read()).

Without this patch, the initial value on my system is for example 3, so that two much items are counted. In the second step the function breaks with a error code, when the information downloading of the non-existing item fails.
Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>
Signed-off-by: Antoine Cellerier <dionoea@videolan.org>
(cherry picked from commit 288f193a)

(and print some extra debug)

(cherry picked from commit a4f7a49f)

Backported after Ken Dreyer reported the fix works as advertised. [vlc-devel]

Try again to fix the Win32 update code and make buildbot happy.

This reverts commit ebfd9455.
(cherry picked from commit 3ec93c14)

Conflicts:

	src/misc/update.c

Fix the Windows update mechanism.

This reverts commit 0f245d7b.

Conflicts:

	src/misc/update.c

(cherry picked from commit bbea92e7)

Also provide workarounds for some broadcasters which ignore this standard.
(cherry picked from commit 6217711a)

(cherry picked from commit fdfc6ad1)

(cherry picked from commit 47f4d3c6)

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