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

(cherry picked from commit 9be0932d795076e8b33cfabb4a2d23042826025d)

The proper reciprocal formula to that of VLC to PA conversion must be
used. Otherwise, we get an inconsistent value in the "volume" variable.
(cherry picked from commit a89517ca4be10847d17db539ed6acf5302fb65dd)

The destructor called interaction_Unregister(), thus also call interaction_Register()
(cherry picked from commit af9d16c530c407834497885916505a97c9aadb75)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Fix #5433
(cherry picked from commit 5db50265)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(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