See http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c89bc900a3bf0d4c4c728ad378703970b4f14e18 for more details.
(cherry picked from commit 229a8957)
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

This reverts commit 1d80eeb8.
Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

This reverts commit c3f9f69f.

(cherry picked from commit b9dc29f1)

(cherry picked from commit 888c97bb)

(cherry picked from commit 10445c27)

(cherry picked from commit 5ddb6667)

(cherry picked from commit cdc6a08d)

(cherry picked from commit 44286759)

(cherry picked from commit bd587fbb)

I believe this path cannot be triggered at the moment however, as
there quite few block_Realloc users. Fixes CID#197.
(cherry picked from commit 2c3d9f17)

(cherry picked from commit 8d834912)

(cherry picked from commit 9087d31f)

(cherry picked from commit 47805700)

(cherry picked from commit 544eea4e)

This bug can never happen, as we never call with pppsz_longname == NULL
at the moment.
(cherry picked from commit 2d9ea592)

(cherry picked from commit 9de4d9dd)

Fix #2159
(cherry picked from commit c34851dc)

(cherry picked from commit 6bd0c375)

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

(cherry picked from commit 636a434c)

(cherry picked from commit 37b0e5a2)

(cherry picked from commit 4bf40479)

(cherry picked from commit f10b7234)

Manually backported from e642dc37

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

The source code in components/interface_widgets.cpp referred to the tvtelx-transparent image as telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) ), while the vlc.qrc resource file referred to it as "tvtelx-trans".

(cherry picked from commit 36088cd5e25bfeb49704c194fb194d1d569b34a5)

(cherry picked from commit 9bea235574a06384f87e0e731c4d67ced62aa2d7)

(cherry picked from commit 7d52e042be7fefecd5f8039d6fa7fa9ee445e060)

Fix telx test in es_out.c: p_block->i_rate has not been defined yet, so do it before testing its value.
(cherry picked from commit 9509b6bba727725f205f561689f653452c73410b)

(cherry picked from commit 270e411db16224b26f348cf31b0d6c470c19ef27)

(cherry picked from commit bc27cf85312aba3894703d3db1ab94586458928a)