summaryrefslogtreecommitdiffstats
path: root/plugins/multimedia/gstreamer/qx11videosurface.h
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update to new license formatSergio Ahumada2012-11-071-22/+22
| | | | | | | Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6 Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-071-3/+3
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-301-17/+17
| | | | | | Fix license in files having old license. Reviewed-by: Trust Me
* Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Justin McPherson2010-05-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/lbt/lbt.pro configure configure.bat dist/changes-1.0.0 doc/src/installation.qdoc examples/player/player.cpp plugins/declarative/declarative.pro plugins/multimedia/symbian/mmf/mmf.pro plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro src/multimedia/multimedia.pro src/multimedia/qvideooutputcontrol.cpp src/multimedia/video/qimagevideobuffer.cpp tests/auto/qaudiooutput/wavheader.h
| * Bump copyright date from 2009 to 2010dac2010-05-071-1/+1
| |
* | Fixed compile error in gstreamer plugin.Kurt Korbatits2010-05-281-4/+0
| | | | | | | | Reviewed-by:TrustMe
* | Merge branch '1.0'Justin McPherson2010-05-271-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/tunerlib_s60/main.cpp configure.bat doc/src/examples/sfw-notes.qdoc doc/src/snippets/multimedia-snippets/player.cpp examples/audiodevices/main.cpp examples/audiorecorder/audiorecorder.cpp examples/player/player.cpp examples/servicenotesmanager/sfw-notes/main.cpp examples/servicenotesmanager/sfw-notes/sfwnotes.h examples/videowidget/main.cpp features/mobility.prf.template plugins/declarative/multimedia/multimedia.cpp plugins/declarative/multimedia/multimedia.pro plugins/declarative/multimedia/qdeclarativeaudio.cpp plugins/declarative/multimedia/qdeclarativeaudio_p.h plugins/declarative/multimedia/qdeclarativemediabase.cpp plugins/declarative/multimedia/qdeclarativemediabase_p.h plugins/declarative/multimedia/qdeclarativevideo.cpp plugins/declarative/multimedia/qdeclarativevideo_p.h plugins/declarative/multimedia/qmetadatacontrolmetaobject.cpp plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h plugins/multimedia/audiocapture/audioencodercontrol.cpp plugins/multimedia/directshow/directshow.pro plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp plugins/multimedia/directshow/player/directshowmetadatacontrol.h plugins/multimedia/gstreamer/gstreamer.pro plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h plugins/multimedia/m3u/m3u.pro plugins/multimedia/qt7/qt7.pro plugins/multimedia/qt7/qt7movierenderer.mm plugins/multimedia/qt7/qt7playermetadata.h plugins/multimedia/qt7/qt7playermetadata.mm plugins/multimedia/qt7/qt7videooutput.h plugins/multimedia/symbian/audiosource/s60audiocaptureservice.h plugins/multimedia/symbian/audiosource/s60audioencodercontrol.h plugins/multimedia/symbian/audiosource/s60audioendpointselector.h plugins/multimedia/symbian/audiosource/s60audiomediarecordercontrol.h plugins/multimedia/symbian/mediaplayer/s60videorenderer.h plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp plugins/multimedia/symbian/mmf/mmf.pro plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h~51509540960f75b3081a288526da21cbf198e9b5 plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp plugins/multimedia/symbian/s60mediaserviceplugin.h plugins/multimedia/symbian/s60videooutputcontrol.cpp plugins/multimedia/symbian/s60videooutputcontrol.h plugins/multimedia/v4l/radio/v4lradiocontrol.cpp plugins/multimedia/v4l/radio/v4lradiocontrol.h plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h plugins/multimedia/wmp/qwmpmetadata.cpp plugins/multimedia/wmp/qwmpmetadata.h plugins/multimedia/wmp/qwmpplayerservice.h plugins/sensors/maemo6/maemo6accelerometer.h plugins/sensors/maemo6/maemo6compass.h plugins/sensors/maemo6/maemo6magnetometer.cpp plugins/sensors/maemo6/maemo6rotationsensor.h plugins/sensors/maemo6/maemo6sensorbase.h plugins/sensors/s60_sensor_api/qs60sensorapicommon.h src/contacts/qcontactactiondescriptor.h src/contacts/qcontactactionfactory.h src/multimedia/audio/qaudioformat.h src/multimedia/effects/qsoundeffect.cpp src/multimedia/effects/qsoundeffect.h src/multimedia/effects/qsoundeffect_pulse_p.cpp src/multimedia/effects/qsoundeffect_pulse_p.h src/multimedia/effects/qsoundeffect_qsound_p.cpp src/multimedia/effects/wavedecoder_p.h src/multimedia/multimedia.pro src/multimedia/qaudiocapturesource.cpp src/multimedia/qaudiocapturesource.h src/multimedia/qaudioendpointselector.h src/multimedia/qgraphicsvideoitem.cpp src/multimedia/qgraphicsvideoitem.h src/multimedia/qgraphicsvideoitem_maemo5.cpp src/multimedia/qmediaencodersettings.cpp src/multimedia/qmediaencodersettings.h src/multimedia/qmediaimageviewer.cpp src/multimedia/qmediaimageviewerservice.cpp src/multimedia/qmediaimageviewerservice_p.h src/multimedia/qmediaobject.cpp src/multimedia/qmediaobject.h src/multimedia/qmediaplayer.cpp src/multimedia/qmediaplayer.h src/multimedia/qmediaplaylist.h src/multimedia/qmediarecorder.cpp src/multimedia/qmediarecorder.h src/multimedia/qmediaserviceprovider.cpp src/multimedia/qmediaserviceprovider.h src/multimedia/qmediaserviceproviderplugin.h src/multimedia/qmediastreamscontrol.cpp src/multimedia/qmediastreamscontrol.h src/multimedia/qmetadatareadercontrol.h src/multimedia/qmetadatawritercontrol.cpp src/multimedia/qmetadatawritercontrol.h src/multimedia/qpaintervideosurface.cpp src/multimedia/qpaintervideosurface_mac_p.h src/multimedia/qpaintervideosurface_p.h src/multimedia/qradiotuner.cpp src/multimedia/qradiotuner.h src/multimedia/qradiotunercontrol.cpp src/multimedia/qradiotunercontrol.h src/multimedia/qtmedianamespace.h src/multimedia/qtmedianamespace.qdoc src/multimedia/qvideooutputcontrol.cpp src/multimedia/qvideowidget.cpp src/multimedia/qvideowidget_p.h src/multimedia/video/qabstractvideobuffer.h src/multimedia/video/qabstractvideosurface.h src/multimedia/video/qimagevideobuffer.cpp src/s60installs/s60installs.pro src/systeminfo/symbian/chargingstatus_s60.h tests/auto/qaudiooutput/wavheader.h tests/auto/qcontactactions/sendemailaction/sendemailaction_p.h tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp tests/auto/qmediaobject/tst_qmediaobject.cpp tests/auto/qmediaplayer/tst_qmediaplayer.cpp tests/auto/qmediarecorder/tst_qmediarecorder.cpp tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp tests/auto/qradiotuner/tst_qradiotuner.cpp tests/auto/qsensor/test_sensor.h tests/auto/qvideowidget/tst_qvideowidget.cpp tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa.cpp tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_aac.cpp tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_macros.h tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_main.cpp tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_wav.cpp tests/playerex_s60/main.cpp tests/playerex_s60/videowidget.cpp
| * | Fixed gstreamer media backend compilation when xvideo is not available.Dmytro Poplavskiy2010-05-121-0/+4
| |/
* | Merge 1.0->module.Justin McPherson2010-05-271-0/+2
| |
* | Fixed some compile errors on win32Kurt Korbatits2010-05-251-1/+1
| |
* | Fixed gstreamer media backend compilation when xvideo is not available.Dmytro Poplavskiy2010-05-121-0/+4
|/
* Handle Qt::KeepAspectRatioByExpanding in gstreamer video window control.Andrew den Exter2010-03-181-0/+3
|
* fix Mobility when compiled with namespace (MOBILITY-404)Alex2009-12-151-0/+2
|
* sync with masterAlex2009-11-201-4/+0
|
* catch up with recent master changesAlex2009-11-191-0/+112