mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-27 09:38:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/faad/gstfaad.c: Remove unused caps cruft from chain function altogether.

Browse source 
Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_update_caps), (gst_faad_chain):
Remove unused caps cruft from chain function altogether.
This commit is contained in:
Tim-Philipp Müller 2006-05-17 09:39:53 +00:00
parent d47f97b0d4
commit 9b3c826eb9
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-05-17 Tim-Philipp Müller <tim at centricular dot net>
* ext/faad/gstfaad.c: (gst_faad_update_caps), (gst_faad_chain):
Remove unused caps cruft from chain function altogether.
2006-05-17 Edward Hervey <edward@fluendo.com> 2006-05-17 Edward Hervey <edward@fluendo.com>
* ext/faad/gstfaad.c: (gst_faad_chain): * ext/faad/gstfaad.c: (gst_faad_chain):

20
ext/faad/gstfaad.c
View file

@ -952,10 +952,10 @@ gst_faad_src_query (GstPad * pad, GstQuery * query)
static gboolean static gboolean
gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info, gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info)
GstCaps ** p_caps)
{ {
GstAudioChannelPosition *pos; GstAudioChannelPosition *pos;
gboolean ret;
GstCaps *caps; GstCaps *caps;
/* store new negotiation information */ /* store new negotiation information */
@ -985,14 +985,10 @@ gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info,
GST_DEBUG ("New output caps: %" GST_PTR_FORMAT, caps); GST_DEBUG ("New output caps: %" GST_PTR_FORMAT, caps);
if (!gst_pad_set_caps (faad->srcpad, caps)) { ret = gst_pad_set_caps (faad->srcpad, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
return FALSE;
}
*p_caps = caps; return ret;
return TRUE;
} }
/* /*
@ -1088,7 +1084,6 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
guchar *input_data; guchar *input_data;
GstFaad *faad; GstFaad *faad;
GstBuffer *outbuf; GstBuffer *outbuf;
GstCaps *caps = NULL;
faacDecFrameInfo info; faacDecFrameInfo info;
void *out; void *out;
gboolean run_loop = TRUE; gboolean run_loop = TRUE;
@ -1246,7 +1241,7 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
} }
if (fmt_change) { if (fmt_change) {
if (!gst_faad_update_caps (faad, &info, &caps)) { if (!gst_faad_update_caps (faad, &info)) {
GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL),
("Setting caps on source pad failed")); ("Setting caps on source pad failed"));
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
@ -1303,9 +1298,6 @@ next:
out: out:
if (caps)
gst_caps_unref (caps);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
gst_object_unref (faad); gst_object_unref (faad);