From e84b203de2ae74373d125e6eaa8e3384c6eacda4 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 6 May 2010 17:47:12 +0200 Subject: [PATCH] decodebin2: rename are_raw_caps to are_final_caps, correct comment https://bugzilla.gnome.org/show_bug.cgi?id=617868 --- gst/playback/gstdecodebin2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index fe6b0b485..4b6ea633d 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -1230,7 +1230,7 @@ gst_decode_bin_autoplug_select (GstElement * element, GstPad * pad, * Discovery methods *****/ -static gboolean are_raw_caps (GstDecodeBin * dbin, GstCaps * caps); +static gboolean are_final_caps (GstDecodeBin * dbin, GstCaps * caps); static gboolean is_demuxer_element (GstElement * srcelement); static gboolean connect_pad (GstDecodeBin * dbin, GstElement * src, @@ -1315,7 +1315,7 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad, &apcontinue); /* 1.a if autoplug-continue is FALSE or caps is a raw format, goto pad_is_final */ - if ((!apcontinue) || are_raw_caps (dbin, caps)) + if ((!apcontinue) || are_final_caps (dbin, caps)) goto expose_pad; /* 1.b when the caps are not fixed yet, we can't be sure what element to @@ -2019,13 +2019,13 @@ is_demuxer_element (GstElement * srcelement) return TRUE; } -/* Returns TRUE if the caps are raw, or if they are compatible with the caps - * specified in the 'caps' property +/* Returns TRUE if the caps are compatible with the caps specified in the 'caps' + * property (which by default are the raw caps) * * The decodebin_lock should be taken ! */ static gboolean -are_raw_caps (GstDecodeBin * dbin, GstCaps * caps) +are_final_caps (GstDecodeBin * dbin, GstCaps * caps) { gboolean res; -- 2.34.1