Skip to content

Commit

Permalink
Merge r180997 - [GStreamer] the GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED…
Browse files Browse the repository at this point in the history
… should be wrapped by a ifdef

https://bugs.webkit.org/show_bug.cgi?id=142274

Patch by Philippe Normand <pnormand@igalia.com> on 2015-03-04
Reviewed by Carlos Garcia Campos.

Don't handle scheduling queries if building against versions of
GStreamer older than 1.2.0.

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcQueryWithParent):

Canonical link: https://commits.webkit.org/154760.317@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@182403 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn authored and carlosgcampos committed Apr 6, 2015
1 parent f41507a commit cd49bab
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
13 changes: 13 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
2015-03-04 Philippe Normand <pnormand@igalia.com>

[GStreamer] the GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED should be wrapped by a ifdef
https://bugs.webkit.org/show_bug.cgi?id=142274

Reviewed by Carlos Garcia Campos.

Don't handle scheduling queries if building against versions of
GStreamer older than 1.2.0.

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcQueryWithParent):

2015-02-16 Milan Crha <mcrha@redhat.com>

[GTK] Loading page into WebView shows g_closure_unref warning
Expand Down
Expand Up @@ -592,6 +592,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
result = TRUE;
break;
}
#if GST_CHECK_VERSION(1, 2, 0)
case GST_QUERY_SCHEDULING: {
GstSchedulingFlags flags;
int minSize, maxSize, align;
Expand All @@ -601,6 +602,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
result = TRUE;
break;
}
#endif
default: {
GRefPtr<GstPad> target = adoptGRef(gst_ghost_pad_get_target(GST_GHOST_PAD_CAST(pad)));

Expand Down

0 comments on commit cd49bab

Please sign in to comment.