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 b07f9ac1a626165e703a711df88e597906dade7f)

(cherry picked from commit 5e5d0aac07e960ea1d59a0209bf63aacb9dd8211)

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

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

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

CVE-2012-2396
(cherry picked from commit 02a1c23e33c01f424b5d2c6de498baaeca2252a3)
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 0ea07fba5ac7677c715664d370c85cbf8ce01d95)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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

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

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

(cherry picked from commit 57d06767e1efc8eeb9e606f23dfcbb5912f1f9ca)
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 42f72172d84ba84b177e5bbec2115cc6ac3eaf4c)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

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

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

(cherry picked from commit 8d9646c187862a9816c943fdc42742e84ec236e7)
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 09b1ee4beca99b7cbeca161ccb738f70f358d744)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 09c2cc894e84a02326e382413f11b88b3c9c15e6)
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 f5bc59c5a6f1b63d6468ba2d483252ecc6010801)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

(cherry picked from commit d34deb64c333d3d051a844be40a262836398cac5)
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 952370a42cfa481e3e5b0896c45a42bdd68e7f1b)
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 4323b8256cccdd92d656a7bb33f3f097cb6bd95a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Especially this is needed when fullscreen is true in video prefs, but video has not started yet.
(cherry picked from commit a0000ecec4d513724fd48f0d7df948fc0f389627)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

this is needed especially for black ui style
(cherry picked from commit 2f6670cc6507ad451c4b1f5046d9b2d0ccd12d9d)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

- do not allow to collapse the window
- block the playlist menu item for now, when video is playing
(cherry picked from commit 44a764957d136977c9d7e1bd76cc3e4eb68e17d0)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

This also check if we should go to fullscreen at video startup (setting in video tab).
(cherry picked from commit daceb54432580f1d18e27225b59d5a0720e48c8a)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

This would break fullscreen state when we are in fullscreen and another video starts.
(cherry picked from commit f16e5943a6b3f89795469b215717168dfd9732fa)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

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