mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsinkconvertbin: setcaps() always returns TRUE and the return value is unused

Browse source 
Change it to a void return value. The caps are forwarded afterwards via
gst_pad_event_default() and not inside this function.

CID 1226477
This commit is contained in:
Sebastian Dröge 2014-08-28 17:13:05 +03:00
parent 0a19783291
commit 2434af3d31
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstplaysinkconvertbin.c
View file

@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_sink_convert_bin_debug);
#define parent_class gst_play_sink_convert_bin_parent_class #define parent_class gst_play_sink_convert_bin_parent_class
static gboolean gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin * static void gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin *
self, GstCaps * caps); self, GstCaps * caps);
G_DEFINE_TYPE (GstPlaySinkConvertBin, gst_play_sink_convert_bin, GST_TYPE_BIN); G_DEFINE_TYPE (GstPlaySinkConvertBin, gst_play_sink_convert_bin, GST_TYPE_BIN);
@ -250,7 +250,7 @@ gst_play_sink_convert_bin_sink_event (GstPad * pad, GstObject * parent,
GstCaps *caps; GstCaps *caps;
gst_event_parse_caps (event, &caps); gst_event_parse_caps (event, &caps);
ret = gst_play_sink_convert_bin_sink_setcaps (self, caps); gst_play_sink_convert_bin_sink_setcaps (self, caps);
break; break;
} }
default: default:
@ -283,7 +283,7 @@ unblock_proxypad (GstPlaySinkConvertBin * self)
} }
} }
static gboolean static void
gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin * self, gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin * self,
GstCaps * caps) GstCaps * caps)
{ {
@ -292,7 +292,8 @@ gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin * self,
gboolean reconfigure = FALSE; gboolean reconfigure = FALSE;
gboolean raw; gboolean raw;
GST_DEBUG_OBJECT (self, "setcaps"); GST_DEBUG_OBJECT (self, "Setting sink caps %" GST_PTR_FORMAT, caps);
GST_PLAY_SINK_CONVERT_BIN_LOCK (self); GST_PLAY_SINK_CONVERT_BIN_LOCK (self);
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
name = gst_structure_get_name (s); name = gst_structure_get_name (s);
@ -338,10 +339,6 @@ gst_play_sink_convert_bin_sink_setcaps (GstPlaySinkConvertBin * self,
} }
GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self); GST_PLAY_SINK_CONVERT_BIN_UNLOCK (self);
GST_DEBUG_OBJECT (self, "Setting sink caps %" GST_PTR_FORMAT, caps);
return TRUE;
} }
#define GST_PLAY_SINK_CONVERT_BIN_FILTER_CAPS(filter,caps) G_STMT_START { \ #define GST_PLAY_SINK_CONVERT_BIN_FILTER_CAPS(filter,caps) G_STMT_START { \