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 7e21f34f)
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 9cee736f)

(cherry picked from commit 76313965)

(cherry picked from commit 6938a98a)

(cherry picked from commit 780bc869)

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 894b9dfb)

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

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

no functional change
(cherry picked from commit d9fb60be)

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

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

(cherry picked from commit 003ba60d)

(cherry picked from commit 3b0b4fb3)

(cherry picked from commit 506ef92b)
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 1536ed21)
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 0d847ccb)
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 59c0cf6f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 18faa622)
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>

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

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