summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
|\
| * Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| * Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| * Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
* | Merge branch 'rjpeg8'aavit2010-02-20132-5513/+24843
|\ \
| * | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-162-5/+10
| * | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| * | Add libjpeg 8aavit2010-02-16137-0/+53170
| * | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-19530-563/+38789
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-19178-10290/+45712
| |\ \ \
| | * \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-18344-559/+956
| | |\ \ \
| * | | | | QT5; Add back volume notification.Justin McPherson2010-02-191-11/+20
| * | | | | Use old notification name for OSX < 10.6.Justin McPherson2010-02-191-7/+9
| * | | | | QT7; make compile on 10.5.Justin McPherson2010-02-191-1/+2
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-1911-59/+197
| |\ \ \ \ \
| | * | | | | QuickTime playback backend: listen for natural size changes and updateDmytro Poplavskiy2010-02-1911-15/+58
| | * | | | | Quicktime playback backend: Recreate the visual context on video nativeDmytro Poplavskiy2010-02-191-30/+42
| | * | | | | QuickTime playback backend: Listen for movie load state changes.Dmytro Poplavskiy2010-02-192-28/+111
| * | | | | | Lowercase Q to uppercase in QML elment URI.Justin McPherson2010-02-191-5/+5
| * | | | | | Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-197-117/+117
| * | | | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-1910-7/+95
| * | | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-1917-197/+197
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma...Qt Continuous Integration System2010-02-18183-4/+37595
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-183-7/+7
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma...Qt Continuous Integration System2010-02-18183-4/+37595
| | |\ \ \ \
| | | * | | | Use the IPropertyBag interface to get audio device names.Andrew den Exter2010-02-181-1/+15
| | | * | | | Make QMediaPlaylist test pass.Andrew den Exter2010-02-171-1/+0
| | | * | | | Fix QMediaPlayer test failure.Andrew den Exter2010-02-175-12/+11
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-172-3/+76
| | | |\ \ \ \
| | | | * | | | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-172-3/+76
| | | * | | | | Fix license headers.Justin McPherson2010-02-172-4/+4
| | | * | | | | Remove unused files.Justin McPherson2010-02-176-419/+0
| | | |/ / / /
| | | * | | | Extend the mappings between Direct Show and QVideoFrame color formats.Andrew den Exter2010-02-161-4/+31
| | | * | | | Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-162-1/+30
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-teamNicholas Young2010-02-163-3/+8
| | | |\ \ \ \
| | | | * | | | Fixed compile error in pulseaudio soundeffect implementationKurt Korbatits2010-02-162-3/+3
| | | | * | | | Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.Andrew den Exter2010-02-161-0/+5
| | | * | | | | Always pass encoded URLs to GStreamer. Fixes issue with spaces inNicholas Young2010-02-161-1/+1
| | | |/ / / /
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimediaJustin McPherson2010-02-152-15/+17
| | | |\ \ \ \
| | | | * | | | Fix flickering when items are overlaid on QGraphicsVideoItem.Andrew den Exter2010-02-152-5/+7
| | | | * | | | Extend hue rotation to a full 360 degrees.Andrew den Exter2010-02-151-1/+1
| | | | * | | | Fix hue rotation in QPainterVideoSurface.Andrew den Exter2010-02-151-9/+9
| | | * | | | | Express dependencies for QtMultimedia.Justin McPherson2010-02-151-2/+3
| | | * | | | | Add missing QT_MODULE to header.Justin McPherson2010-02-151-0/+2
| | | * | | | | Cleanup include files.Justin McPherson2010-02-155-17/+50
| | | * | | | | Use correct license headers.Justin McPherson2010-02-1510-20/+20
| | | * | | | | Use correct path for private header.Justin McPherson2010-02-151-1/+1
| | | * | | | | Use correct path for headers and source in qml.pri.Justin McPherson2010-02-151-6/+6
| | | * | | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-14489-1809/+109403
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |