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

Conflicts:
	modules/packetizer/mpeg4audio.c

Split it in several functions

(cherry picked from commit 6eddafe741954803ec2928d26fb7566bd07a3601)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

merge declaration and initial assignement

(cherry picked from commit 301c200aa93c637d9896a0f71f03e856a6daf2b7)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Close #9209

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

(cherry picked from commit 53893837073edd6e14c40c632e777b895d10b7c7)

(cherry picked from commit 873c7e91207545aeaba931143c4e8d1de0640813)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Conflicts:
	modules/access/directory.c

fixes ed616a22

(cherry picked from commit 4ebe98116b867af109d051c376b266653b224923)

Conflicts:
	modules/gui/macosx/CompatibilityFixes.h
	modules/gui/macosx/intf.m

Fixes: #3899
(cherry picked from commit 3e92a084d4fe75e90a37dcc44e7c0d31d7faa4c5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 697766fe84fc6fa94f1bef61dbf0193991474a58)

The first show() was never satisfied because the widget was not
initialized at this point.

(cherry picked from commit 9653db32b9670e25c587cb0308b7aef97aa08f7f)

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 9a74aaad855d14a2e82d8599624280c12dcce5d5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit dd212bfe22089604415aefa69b33cd8f354cd847)

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

Conflicts:
	modules/codec/avcodec/vaapi.c

(cherry picked from commit e0e73f09a3467250e5028efd7c9bc6b0b1a69474
 with modifications)

Fixes #7409
(cherry picked from commit 37f1c06e61deb09948436ac7d115ed4d029334d7)

Fixes #8430
Signed-off-by: Rafaël Carré <funman@videolan.org>

This should avoid integer overflows inside the libebml causing heap buffer overflow. Since new called by the lib is limited to SIZE_MAX bytes.
(cherry picked from commit 027380966251622435288af5b0f9bacfec549288)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp

(cherry picked from commit 59c9e8309d5b435a2d85c2c9eaae979ba56ccdd9)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp

(cherry picked from commit f5bb58e308b5b595b11b129490d5981a10992b66)

(cherry picked from commit 4e79526324b65db23945d7355e5f323731a73faa)

Conflicts:
	modules/access/qtsound.m

(cherry picked from commit 29d00aef355dfc468e06dc35e7de0361e318f340)

(cherry picked from commit 04b45e8ffd279a6df19ff96d6157a688bd6b7a08)

Conflicts:
	modules/gui/macosx/open.m

The issue was initialy reported here:
http://bugzilla.redhat.com/891123

FLAC upstream has always expected to include <FLAC/ suffix
for included headers as shown in examples/c/decode/file/main.c

The FLAC suffix will not be be made available in the flac.pc
for the next release:
http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.htmlSigned-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 607065b410b4768372c204ccdbbca200230fff25)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit b50c7652c71962d64df75ec60a901131e577fdc7)

(cherry picked from commit 272f2282872a605d3ba897aa0ff9576bf89e8165)
Signed-off-by: Rafaël Carré <funman@videolan.org>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>