(cherry picked from commit 8de3a90b2be9bac51eff19200690214bd97a94eb)

Conflicts:

	modules/gui/macosx/playlist.m

(cherry picked from commit 3dd486c8fe49c25f6bca2f93333cdcb83312e2be)

(cherry picked from commit 0e5226e0eeee223fb5e8e7c33e1fa36f3c4f5e62)

macosx: don't manipulate the existing selection when right-clicking on the playlist table (close #6892)
(cherry picked from commit 50962d72c11ff3a7c382e4d9314ef3dcba6e5eec)

(cherry picked from commit 0d1ec0b0c1b7ce333fac03f4870dc414a8c0921d)

(cherry picked from commit 8405c0784c4e8f15ff6d38babc1dbfab61e9436c)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

macosx: fixed corner-case in which the playlist table was displayed instead of the newly created vout
(cherry picked from commit 208028660fe17278a04eafe0b05c3a715e069a71)

Should fix free format playback

Partial backport of de7ab0663

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

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

(cherry picked from commit 21e4928a)
(cherry picked from commit 3e7cc6f5)
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 ac5631c7)

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

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

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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 78baddd0)
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 0e3e2b84)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

X-Patched-By: Sergey Bolshakov <sbolshakov@altlinux.org>
(cherry picked from commit 75a167f5)
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 e943ace3)

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

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

(cherry picked from commit b10e5817)

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>