Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit

Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
2011-08-30 14:42:21 +10:00
parent 4ddffcdae3 47a5dd4371
commit 3bf236cc23
58 changed files with 2121 additions and 977 deletions
--- a/config.tests/gstreamer_photography/gstreamer_photography.pro
+++ b/config.tests/gstreamer_photography/gstreamer_photography.pro
@@ -14,7 +14,8 @@ PKGCONFIG += \
    gstreamer-base-0.10 \
    gstreamer-interfaces-0.10 \
    gstreamer-audio-0.10 \
-    gstreamer-video-0.10
+    gstreamer-video-0.10 \
+    gstreamer-pbutils-0.10

 LIBS += -lgstphotography-0.10

--- a/config.tests/gstreamer_photography/main.cpp
+++ b/config.tests/gstreamer_photography/main.cpp
@@ -43,6 +43,8 @@

 #include <gst/interfaces/photography.h>
 #include <gst/interfaces/photography-enumtypes.h>
+#include <gst/pbutils/pbutils.h>
+#include <gst/pbutils/encoding-profile.h>

 int main(int argc, char** argv)
 {