summaryrefslogtreecommitdiffstats
path: root/src/multimedia/base
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-122-0/+11
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-102-0/+11
| |\
| | * Fix compile error with QT_NO_LIBRARY in QtMultimediaTasuku Suzuki2010-04-091-0/+2
| | * Compile on 10.4.Morten Johan Sørvig2010-04-081-0/+9
* | | Add meta-data keys for embedded images.Andrew den Exter2010-04-122-1/+10
|/ /
* | Reimplemented event() and sceneEvent() in video item, for BC.Dmytro Poplavskiy2010-04-082-2/+24
|/
* Fixed incorrectly clipped video when rendered on QGLWidgetDmytro Poplavskiy2010-03-311-10/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-301-7/+27
|\
| * Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| * Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-7/+26
* | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
|/
* QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-295-24/+411
* Compile Qt in C++0x mode.Thiago Macieira2010-03-201-17/+17
* Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-187-65/+79
* QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-053-4/+4
|\
| * Fix spelling in enumeration.Justin McPherson2010-03-053-4/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-041-4/+4
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-031-4/+4
| |\
| | * OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
* | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-042-10/+36
|/ /
* | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-031-5/+9
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-262-0/+10
|\
| * QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2420-6/+29
|\ \ | |/ |/|
| * Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-2420-6/+29
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-242-0/+15
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-232-0/+15
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-232-0/+15
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-232-10/+14
| | | |\
| | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-232-0/+15
* | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
|/ / / /
* | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-231-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-221-1/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Fix compilation with namespace.ck2010-02-221-1/+3
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-221-1/+3
|\ \ \ | |/ / |/| |
| * | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-221-1/+3
| |/
* | Documentation fixes.Justin McPherson2010-02-222-10/+14
|/
* Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-192-4/+4
* Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-197-26/+26
* Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-181-4/+4
* Make QMediaPlaylist test pass.Andrew den Exter2010-02-171-1/+0
* Fix QMediaPlayer test failure.Andrew den Exter2010-02-173-5/+5
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-171-2/+74
|\
| * Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-171-2/+74
* | Fix license headers.Justin McPherson2010-02-172-4/+4
|/
* Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-161-0/+26
* Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.Andrew den Exter2010-02-161-0/+5
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimediaJustin McPherson2010-02-152-15/+17
|\