diff options
| author | Alex Wilson <alex.wilson@nokia.com> | 2012-01-17 15:29:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 08:07:47 +0100 |
| commit | f5d4239d323767931164968ba1529958b14cadcb (patch) | |
| tree | d278b83a81d4497f966e3afd47f6d10493f6ebe6 /examples | |
| parent | 173d46496ded509ac58c83495fd33abc6c24e2c8 (diff) | |
| download | qtlocation-f5d4239d323767931164968ba1529958b14cadcb.tar.gz | |
Replacing mp4 video with ogg/theora
It's open source, makes it tastier.
Change-Id: I24d2eab45e5f1f92af2967196a90fe0c6692cbf3
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/mapviewer/content/map/VideoItem.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/mapviewer/demo.mp4 | bin | 776174 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/mapviewer/demo.ogv | bin | 0 -> 642306 bytes | |||
| -rw-r--r-- | examples/declarative/mapviewer/mapviewer.pri | 2 | ||||
| -rw-r--r-- | examples/declarative/mapviewer/mapviewerwrapper.qrc | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/mapviewer/content/map/VideoItem.qml b/examples/declarative/mapviewer/content/map/VideoItem.qml index 6315563b..1962155c 100644 --- a/examples/declarative/mapviewer/content/map/VideoItem.qml +++ b/examples/declarative/mapviewer/content/map/VideoItem.qml @@ -65,7 +65,7 @@ MapQuickItem { //to be used inside MapComponent only height: 144; MediaPlayer { id: player - source: Qt.resolvedUrl("../../demo.mp4") + source: Qt.resolvedUrl("../../demo.ogv") playing: true onStopped: { diff --git a/examples/declarative/mapviewer/demo.mp4 b/examples/declarative/mapviewer/demo.mp4 Binary files differdeleted file mode 100644 index 890b428c..00000000 --- a/examples/declarative/mapviewer/demo.mp4 +++ /dev/null diff --git a/examples/declarative/mapviewer/demo.ogv b/examples/declarative/mapviewer/demo.ogv Binary files differnew file mode 100644 index 00000000..1ed7e540 --- /dev/null +++ b/examples/declarative/mapviewer/demo.ogv diff --git a/examples/declarative/mapviewer/mapviewer.pri b/examples/declarative/mapviewer/mapviewer.pri index 5670763b..c959653b 100644 --- a/examples/declarative/mapviewer/mapviewer.pri +++ b/examples/declarative/mapviewer/mapviewer.pri @@ -1,7 +1,7 @@ qmlcontent.files += \ mapviewer.qml \ - demo.mp4 + demo.ogv OTHER_FILES += $$qmlcontent.files qmlcontentmap.files += \ diff --git a/examples/declarative/mapviewer/mapviewerwrapper.qrc b/examples/declarative/mapviewer/mapviewerwrapper.qrc index 1a27b962..854a6503 100644 --- a/examples/declarative/mapviewer/mapviewerwrapper.qrc +++ b/examples/declarative/mapviewer/mapviewerwrapper.qrc @@ -14,6 +14,6 @@ <file>content/map/VideoItem.qml</file> <file>content/map/3dItem.qml</file> <file>content/map/MiniMap.qml</file> - <file>demo.mp4</file> + <file>demo.ogv</file> </qresource> </RCC> |