Backed out changeset d22ac63d67f1 (bug 967927) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 24 Feb 2014 10:56:37 -0500
changeset 170558 5612a5999be386179a2d176cd2afa1abe6dbad31
parent 170557 446e305b2aee062a2388e7ca07d5db709be01a36
child 170559 95325311fa2ef3e1a633f990b5adeb6d67650c91
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs967927
milestone30.0a1
backs outd22ac63d67f134fbaf49686ecd5c6754c58078f9
Backed out changeset d22ac63d67f1 (bug 967927) for bustage. CLOSED TREE
content/media/gstreamer/GStreamerAllocator.cpp
content/media/gstreamer/GStreamerMozVideoBuffer.cpp
--- a/content/media/gstreamer/GStreamerAllocator.cpp
+++ b/content/media/gstreamer/GStreamerAllocator.cpp
@@ -41,22 +41,18 @@ typedef struct
   GstVideoBufferPoolClass parent_class;
 } MozGfxBufferPoolClass;
 
 typedef struct
 {
   GstVideoBufferPool pool;
 } MozGfxBufferPool;
 
-// working around GTK+ bug https://bugzilla.gnome.org/show_bug.cgi?id=723899
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
 G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR);
 G_DEFINE_TYPE(MozGfxBufferPool, moz_gfx_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
-#pragma clang diagnostic pop
 
 void
 moz_gfx_memory_reset(MozGfxMemory *mem)
 {
   if (mem->image)
     mem->image->Release();
 
   ImageContainer* container = ((MozGfxMemoryAllocator*) mem->memory.allocator)->reader->GetImageContainer();
--- a/content/media/gstreamer/GStreamerMozVideoBuffer.cpp
+++ b/content/media/gstreamer/GStreamerMozVideoBuffer.cpp
@@ -9,21 +9,17 @@
 #include "GStreamerMozVideoBuffer.h"
 #include "ImageContainer.h"
 
 namespace mozilla {
 
 static GstMozVideoBuffer *gst_moz_video_buffer_copy(GstMozVideoBuffer* self);
 static void gst_moz_video_buffer_finalize(GstMozVideoBuffer* self);
 
-// working around GTK+ bug https://bugzilla.gnome.org/show_bug.cgi?id=723899
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
 G_DEFINE_TYPE(GstMozVideoBuffer, gst_moz_video_buffer, GST_TYPE_BUFFER);
-#pragma clang diagnostic pop
 
 static void
 gst_moz_video_buffer_class_init(GstMozVideoBufferClass* klass)
 {
   g_return_if_fail(GST_IS_MOZ_VIDEO_BUFFER_CLASS(klass));
 
   GstMiniObjectClass *mo_class = GST_MINI_OBJECT_CLASS(klass);