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

opengl vout: fixed chroma issue with dated PowerPC-based Macs, which run OpenGL 1.3 only and don't support the GL_ARB_fragment_program extension
(cherry picked from commit ac5631c730899f750338b1e47335f2159e72d407)

This should fix the build with recent automake (fix #6911).
(cherry picked from commit fc55e4a1df2e691c73a28c6d6bc18143d60b97de)

Anyway V4L1 is dead, so there is no ambiguity.
(cherry picked from commit c7d276074d6f83580a4c5e6fb15699bcf92db227)

Conflicts:

	modules/access/v4l2/v4l2.c

whoami need to escape the backslash in 'pc\user' otherwise src/version.c can't compile.
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 126d1ccc2c3d3faf6ec8e2bf53bae73273025098)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Variable `loop` was uninitialized and resulted in an error when being
concatenated. Initialize the variable to blank: `local loop = ""`.

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

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

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

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

X-Patched-By: Sergey Bolshakov <sbolshakov@altlinux.org>
(cherry picked from commit 75a167f5b377a1edba3e1bf0230af05da7974347)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

freetype: in case the provided font name is neither found by name nor by family, let ATS check whether it is a correct PostScript name

This fixes issues with some Asian fonts as pointed by Naohiro Koriyama
(cherry picked from commit e943ace33cce82c1a59b67000f2fbd99ff54130e)

freetype: provide a proper fix to prevent ATS from crashing when searching for the font family instead of the fontname
(cherry picked from commit 10e87394ea679dd8bdabc582d4f83ca90f9e8c40)

This fixes the freetype ATS lookup for some Asian fonts such as Hiragino Micho ProN with multiple weights.
(cherry picked from commit 26303bddc76d9b5a29767b77d44b8fbece932092)

(cherry picked from commit b10e58173a1190b06cd8826147cc8ac36b04d9a3)

Conflicts:

	modules/notify/growl.m

This API was deprecated in 10.6, but still works correctly on 10.7. CoreText is the modern replacement, but doesn't provide the needed functionality so far.

(cherry picked from commit 9cee736f1276daa463bc6fa9127dfb9d5f52d957)

(cherry picked from commit 763139653998328284518112904e0e8ec4d9b8d8)

(cherry picked from commit 6938a98a430431a7d8f41228c60dd883b8264e6a)

(cherry picked from commit 780bc86907509205c3d0335350aeed909a427a2b)

This is as already done a long time ago for PulseAudio. VLC might
deliver audio a long time ahead, but there is no warranty thereof.
So a small latency must be assumed for the worst case.
(cherry picked from commit 894b9dfb3b1d3d5852cb0d52470d73c06be27b37)

This should fix support for or work around bugs in, some drivers:
 * explicitly disable soft-resampler,
 * define access mode before sample format,
 * set buffer before period,
 * use period time rather than period count.
(cherry picked from commit d80d6da77e3074d3ecc67fb70a8305d08f137f43)

macosx: lock the scroll direction for 0.8 secs, so the user can scroll through the movie or adjust the volume without affecting the other function (close #6893)

This is especially needed for the multitouch trackpads
(cherry picked from commit d34619d34cc2e93c02f66dd04b41f74a6ec4eeed)

no functional change
(cherry picked from commit d9fb60bec03044bb7bc20e9a18d52f43f940b75b)

close #6870
(cherry picked from commit 01533a3cb5eece7f3e6638f51415df4909ccb6c7)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

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

(cherry picked from commit 003ba60d1911a7f6a6a97aaf24324660f50b3959)

(cherry picked from commit 3b0b4fb354db179353d4d319484f1711f979de58)

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

- volume and mute hotkeys are handled by core now, providing a proper osd screen
- some fixes in detection if key combo is valid hotkey
- fix for mem leak
(cherry picked from commit 1536ed21be0f545840bf8b15e89e4f81fd1908a8)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

Currently, two objects of the class VLCMainWindow are generated. The first is alloated
from intf.m (triggered by the first log message that arrives) and is initialized by
both init and initWithContentRect. The second object is created from inside the nib file,
and is instantiated ONLY with initWithContentRect. Therefore, up to now _o_sharedInstance
had the wrong object and all calls to sharedInstance would cause problems.
But somehow, o_mainwindow in intf.m is updated to the correct second object, although it holds
the first object at start.

Furthermore, o_fspanel is also instantiated through the nib file.
(cherry picked from commit 0d847ccb8d2e58147fe351a10fc89e777f469fb8)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

Fixes MSVR 151, MSVR 193 and MSVR 195
Finder: Jeremy Brown at Microsoft and Microsoft Vulnerability Research (MSVR)

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

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

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>