Title: [245537] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 245537
- Author
- [email protected]
- Date
- 2019-05-20 14:20:02 -0700 (Mon, 20 May 2019)
Log Message
Merged r243690 - Build failure after r243644 in GTK Linux 64-bit stable builds
https://bugs.webkit.org/show_bug.cgi?id=196440
Patch by Pablo Saavedra <[email protected]> on 2019-04-01
Reviewed by Philippe Normand.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (245536 => 245537)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-05-20 21:17:02 UTC (rev 245536)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-05-20 21:20:02 UTC (rev 245537)
@@ -1,3 +1,13 @@
+2019-04-01 Pablo Saavedra <[email protected]>
+
+ Build failure after r243644 in GTK Linux 64-bit stable builds
+ https://bugs.webkit.org/show_bug.cgi?id=196440
+
+ Reviewed by Philippe Normand.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
+
2019-05-16 Carlos Garcia Campos <[email protected]>
[FreeType] Some character sequences with a variation selector are not rendered
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (245536 => 245537)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-05-20 21:17:02 UTC (rev 245536)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-05-20 21:20:02 UTC (rev 245537)
@@ -1000,11 +1000,13 @@
break;
}
+#if USE(GSTREAMER_GL)
// When the imxvpudecoder is used, the texture sampling of the
// directviv-uploaded texture returns an RGB value, so there's no need to
// convert it.
if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
