summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-04-27 16:01:32 +0200
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-05-03 22:31:56 +0300
commit5d3ec919945740011185631d554ee94bdc5b012f (patch)
tree2798665384842e62dd5858fa885397967258dc6e
parent7c8cdb6c00409e9e19f9ee683bd06ecd7c1bc8b8 (diff)
elements/gstqtvideosink/bufferformat.cpp: remove 0.10-specific workaround
-rw-r--r--elements/gstqtvideosink/utils/bufferformat.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/elements/gstqtvideosink/utils/bufferformat.cpp b/elements/gstqtvideosink/utils/bufferformat.cpp
index 52e7b23..e16a080 100644
--- a/elements/gstqtvideosink/utils/bufferformat.cpp
+++ b/elements/gstqtvideosink/utils/bufferformat.cpp
@@ -36,19 +36,6 @@ GstCaps* BufferFormat::newTemplateCaps(GstVideoFormat format)
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
- // workaround for https://bugzilla.gnome.org/show_bug.cgi?id=667681
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
- switch (format) {
- case GST_VIDEO_FORMAT_RGB16:
- case GST_VIDEO_FORMAT_BGR16:
- case GST_VIDEO_FORMAT_RGB15:
- case GST_VIDEO_FORMAT_BGR15:
- gst_caps_set_simple(caps, "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL);
- break;
- default:
- break;
- }
-#endif
return caps;
}
@@ -65,23 +52,7 @@ GstCaps* BufferFormat::newCaps(GstVideoFormat format, const QSize & size,
videoInfo.par_n = pixelAspectRatio.numerator;
videoInfo.par_d = pixelAspectRatio.denominator;
- GstCaps *caps = gst_video_info_to_caps(&videoInfo);
-
- // workaround for https://bugzilla.gnome.org/show_bug.cgi?id=667681
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
- switch (format) {
- case GST_VIDEO_FORMAT_RGB16:
- case GST_VIDEO_FORMAT_BGR16:
- case GST_VIDEO_FORMAT_RGB15:
- case GST_VIDEO_FORMAT_BGR15:
- gst_caps_set_simple(caps, "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL);
- break;
- default:
- break;
- }
-#endif
-
- return caps;
+ return gst_video_info_to_caps(&videoInfo);
}
int BufferFormat::bytesPerLine(int component) const