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

5cc3984f92754e1fd3643039354f8f00c324a90c 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 018de320fa70078984c2744b4f994467d8a7c4dd)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 025e08ce9c5e67bd17ca1aa84b6a9a56e4e31682)

(cherry picked from commit 36c1cbc3f2e228ef120e7413cc2613d3f8aded5c)

Conflicts:

	configure.ac

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

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

(cherry picked from commit ab5f8e9460b96d8b16e8a2020c41f5f37d9df789)

(cherry picked from commit 0b01c67ef5204d352701f15617b69859f4dcfaa0)
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 4f36a3e7b0e62d3dfed0b87eccf925e3017f1998)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 37bef1d6d63314e01af86fe2080d188719f61152)
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 2b5aff224a537fedf35e63ba7a637cd9ff490e71)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit adeaefc878674b3f79b935cb406d8fea9da9de54)
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 [9b88eef6]

Manual backport of [13acaa7e]

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 9c1e5242)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

It seems that decoders not using AVContext::get_buffer() do not
initialize AVFrame::reordered_opaque.

It is doing the same as [5f6359d0] from
vlc master.

This close #3646
(cherry picked from commit 07990fcd)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

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