(cherry picked from commit 0845bbed)

The format must be initialized before aout_PacketInit().
Fix Debian #664279 and LP#987231.

Pointed-out-by: Walter Ösch
(cherry picked from commit c028792e)

(for whatever reason this was only observable on snow leopard for me)
(cherry picked from commit fa3efbec)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

(cherry picked from commit 3bd2a8ea)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

ffmpeg/libav doc/APIchanges should not be relied upon
(cherry picked from commit 7f510436)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit c9ef39b1)

Note that the displayed icon is a re-rendering based upon the original sources, since we need a higher resolution icon on the Mac.

(cherry picked from commit b07f9ac1)

(cherry picked from commit 5e5d0aac)

This reverts commit f435727d.

Reported by: An anonymous contributor working with the SecuriTeam Secure
Disclosure
program (http://www.beyondsecurity.com/ssd.html)
(cherry picked from commit 6a41b030)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 37f24581)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

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

CVE-2012-2396
(cherry picked from commit 02a1c23e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

For multi-volume archives the compressed size refers to the size of the data in the volume rather than the entire archive.
Signed-off-by: Laurent Aimar <fenrir@videolan.org>
(cherry picked from commit 0ea07fba)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

We want to use the new names in our code
(cherry picked from commit 6689109f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

We want to use the new ones in our code
(cherry picked from commit dd749233)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

That was resizing when video was stacked in the playlist
(cherry picked from commit 66b3569c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Close #6720
(cherry picked from commit 830c1cff)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

macosx: fix issue where fullscreen controls are deactivated then video starts from lion fullscreen mode

close #6351
(cherry picked from commit 42f72172)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

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

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

(cherry picked from commit 8d9646c1)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

Close #5980

Close #6646
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 09b1ee4b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes #6599
(cherry picked from commit 15b1a1b9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

If rate stays at 0, a FPE will be raised in SetupOutput.
(cherry picked from commit f5bc59c5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Details: From Lua 5.2: Change to '\z' escape.
Reject undefined escape sequences. The
proper way to match the dot in Lua is %.
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>
(cherry picked from commit 952370a4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

There is no GPLv2 compatible AAC encoder available today
FFmpeg's one is considered to be useless crap (including by its authors)
(cherry picked from commit 4323b825)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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