summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1714-14/+14
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1014-14/+14
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+1
|\ \ | |/
| * Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+1
|\ \ | |/
| * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+1
| |\
| | * Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2010-07-221-1/+1
* | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-13/+13
|/ /
* | Added a QPixmap based QAbstractVideoBuffer HandleType.Dmytro Poplavskiy2010-07-162-0/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-231-0/+1
|\ \
| * | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-231-0/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-0/+3
|\ \ \ | |/ / |/| / | |/
| * Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.Dmytro Poplavskiy2010-06-181-0/+3
* | Removed mediaservices.Kurt Korbatits2010-05-1815-0/+3029
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-1515-3029/+0
* | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
|/
* Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
* Update copyright year to 2010Jason McDonald2010-01-0614-14/+14
* API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
* QVideoFrame API review changes.Andrew den Exter2009-11-042-20/+20
* QVideoSurfaceFormat API review changes.Andrew den Exter2009-11-042-54/+32
* QAbstractVideoSurface API review changes.Andrew den Exter2009-11-043-29/+44
* Change the frame rate property to a qreal from a QPair<int,int> rationalAndrew den Exter2009-10-152-42/+17
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0914-56/+56
|\
| * Update license headers again.Jason McDonald2009-09-0914-56/+56
* | Fixed 'illegal empty declaration' warning reported by Nokia X86 compilerJanne Anttila2009-09-081-1/+1
|/
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3113-169/+169
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
* compile fix with namespaceshjk2009-08-261-0/+4
* Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-2415-0/+3057