summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* compile fix with namespaceshjk2009-08-2613-1/+48
| | | | 13 pairs missing...
* Merge commit 'origin/master' into 4.6Jason Barron2009-08-252-4/+4
|\
| * Removed some 'illegal empty declaration' warnings from Symbian buildJanne Anttila2009-08-242-4/+4
| | | | | | | | Reviewed-by: TrustMe
* | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-2416-6/+3064
|/ | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy
* Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-2/+2
| | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* Update contact URL in license headers.Jason McDonald2009-08-1239-39/+39
| | | | Reviewed-by: Trust Me
* multimedia: fix warnings on mingwThierry Bastian2009-08-064-4/+3
| | | | | moved static CRITICAL_SECTIONs to cpp files. In header they would be declared more than once depending on what file includes those headers.
* Merge AudioServices into mainline.Justin McPherson2009-08-0541-0/+10144