mozilla-central: changeset 133840:0692ed4ff443fb0d8983f8b106e0357fac8525d4

author	John Schoenick <jschoenick@mozilla.com>
	Fri, 31 May 2013 15:57:43 -0700
changeset 133840	0692ed4ff443fb0d8983f8b106e0357fac8525d4
parent 133839	720f1ff081fb459ff2a6eb1ab84697929239236b
child 133841	08a29f18500a1ef8e21187c68de482814bc029aa
push id	24773
push user	ryanvm@gmail.com
push date	Tue, 04 Jun 2013 00:43:28 +0000
treeherder	mozilla-central@7e3a4ebcf067 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted
bugs	878363
milestone	24.0a1
first release with	nightly linux32 7e3a4ebcf067 / 24.0a1 / 20130604031112 / files nightly linux64 7e3a4ebcf067 / 24.0a1 / 20130604031112 / files nightly mac 7e3a4ebcf067 / 24.0a1 / 20130604031112 / files nightly win32 7e3a4ebcf067 / 24.0a1 / 20130604031112 / files nightly win64 7e3a4ebcf067 / 24.0a1 / 20130604031112 / files
last release without	nightly linux32 198e38876f7e / 24.0a1 / 20130603031140 / files nightly linux64 198e38876f7e / 24.0a1 / 20130603031140 / files nightly mac 198e38876f7e / 24.0a1 / 20130603031140 / files nightly win32 198e38876f7e / 24.0a1 / 20130603031140 / files nightly win64 198e38876f7e / 24.0a1 / 20130603031140 / files

--- a/content/media/gstreamer/GStreamerReader.h
+++ b/content/media/gstreamer/GStreamerReader.h
@@ -3,17 +3,20 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if !defined(GStreamerReader_h_)
 #define GStreamerReader_h_
 
 #include <gst/gst.h>
 #include <gst/app/gstappsrc.h>
 #include <gst/app/gstappsink.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreserved-user-defined-literal"
 #include <gst/video/video.h>
+#pragma GCC diagnostic pop
 #include <map>
 #include "MediaDecoderReader.h"
 
 namespace mozilla {
 
 namespace dom {
 class TimeRanges;
 }