1.1 --- a/mozilla-gstreamer-1.patch Mon Mar 04 07:34:56 2013 +0100
1.2 +++ b/mozilla-gstreamer-1.patch Mon Mar 04 07:35:52 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 # HG changeset patch
1.5 -# Parent fb80f99ca86bacbcddaf203f7183e0456f194811
1.6 +# Parent 0559be6b60075e1a708ca90e874f922ff200c462
1.7 # User Mike Gorse <mgorse@suse.com>
1.8
1.9 Bug 806917 - support GStreamer 1.0
1.10 @@ -51,6 +51,31 @@
1.11 _SAVE_LDFLAGS=$LDFLAGS
1.12 LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
1.13 AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
1.14 +diff --git a/content/media/gstreamer/GStreamerFormatHelper.cpp b/content/media/gstreamer/GStreamerFormatHelper.cpp
1.15 +--- a/content/media/gstreamer/GStreamerFormatHelper.cpp
1.16 ++++ b/content/media/gstreamer/GStreamerFormatHelper.cpp
1.17 +@@ -141,17 +141,21 @@ bool GStreamerFormatHelper::HaveElements
1.18 + }
1.19 + g_list_free(list);
1.20 + }
1.21 +
1.22 + return true;
1.23 + }
1.24 +
1.25 + GList* GStreamerFormatHelper::GetFactories() {
1.26 ++#if GST_VERSION_MAJOR == 1
1.27 ++ uint32_t cookie = gst_registry_get_feature_list_cookie(gst_registry_get());
1.28 ++#else
1.29 + uint32_t cookie = gst_default_registry_get_feature_list_cookie ();
1.30 ++#endif
1.31 + if (cookie != mCookie) {
1.32 + g_list_free(mFactories);
1.33 + mFactories = gst_element_factory_list_get_elements
1.34 + (GST_ELEMENT_FACTORY_TYPE_DEMUXER | GST_ELEMENT_FACTORY_TYPE_DECODER,
1.35 + GST_RANK_MARGINAL);
1.36 + mCookie = cookie;
1.37 + }
1.38 +
1.39 diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp
1.40 --- a/content/media/gstreamer/GStreamerReader.cpp
1.41 +++ b/content/media/gstreamer/GStreamerReader.cpp