summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-17 01:48:51 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-17 01:48:51 (GMT)
commitefb58e8a0b164747becbac01ec742c2b4a0459ac (patch)
tree367fc667515c66111597072d3e8571ca1cd448c7 /src/plugins/mediaservices
parent08815ab306eb61d4a6abdfce0fe3ea9d50d46212 (diff)
parent1f93babe307efa37f0ca93c235ae1b616f303ee4 (diff)
downloadQt-efb58e8a0b164747becbac01ec742c2b4a0459ac.zip
Qt-efb58e8a0b164747becbac01ec742c2b4a0459ac.tar.gz
Qt-efb58e8a0b164747becbac01ec742c2b4a0459ac.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team
Diffstat (limited to 'src/plugins/mediaservices')
-rw-r--r--src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
index 3108e1a..a3c7157 100644
--- a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
+++ b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
@@ -227,7 +227,8 @@ static const YuvFormat qt_yuvColorLookup[] =
{ QVideoFrame::Format_UYVY, GST_MAKE_FOURCC('U','Y','V','Y'), 16 },
{ QVideoFrame::Format_YUYV, GST_MAKE_FOURCC('Y','U','Y','2'), 16 },
{ QVideoFrame::Format_NV12, GST_MAKE_FOURCC('N','V','1','2'), 8 },
- { QVideoFrame::Format_NV21, GST_MAKE_FOURCC('N','V','2','1'), 8 }
+ { QVideoFrame::Format_NV21, GST_MAKE_FOURCC('N','V','2','1'), 8 },
+ { QVideoFrame::Format_AYUV444, GST_MAKE_FOURCC('A','Y','U','V'), 32 }
};
static int indexOfYuvColor(QVideoFrame::PixelFormat format)