(cherry picked from commit ae3528d4)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

Seems that maxrate needs somekinda exponential function from bitrate (comparing
ffmpeg's libvpx presets) and cbr isn't something you likely will get out of this.
(cherry picked from commit d3c422e3)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit 86263dcd)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

(cherry picked from commit 3862bf72)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>

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

5cc3984f was too strict, and for baseline it
should be only cosmetic change.

libx264 changed default to normal in that build too, also change logic
littebit so b-pyramid selection works better.

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

Reported by Lotesdelere

reported by Lotesdelere
(cherry picked from commit 018de320)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 025e08ce)

(cherry picked from commit 36c1cbc3f2e228ef120e7413cc2613d3f8aded5c)

Conflicts:

	configure.ac

Pointed-out-by: Sébastien Escudier
(cherry picked from commit f8e7eaf7)

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

(cherry picked from commit ab5f8e94)

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

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

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

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

That fixes the y4m with unknown chroma that avformat can read (Close #3656)
(cherry picked from commit 2b5aff22)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

legacy OS X intf: fixed a rare case in which the vout window could loose its window decoration on recreation after a performed close

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

Use only pkg-config.
Fix sdl_image detection
(cherry picked from commit 56a2cf34)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

But you need careful, if you compile without X and then run with an X-enabled PulseAudio, boom.

Closes: #3650
(cherry picked from commit d0068498)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

Signed-off-by: Laurent Aimar <fenrir@videolan.org>

Manual backport of [9b88eef666b12b7f626c9bfa68db66b66da9103d]

Manual backport of [13acaa7e01519d2c8f8e6743e297611b14add161]

Mac OS X: added various missing file extensions to the supported-by-this-application-list (xa, m3u8, b4s, vlc, xm, amr, aob, dts, cdg, idx, oma, voc, vqf, mpeg1, mpeg2, mpeg4, mts, mid, mlp, webm, rar, rec, rmi, s3m, vro, tod, utf)

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

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