FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opus: fix bad merge (stray unmap, undeclared var)

Browse Source
This commit is contained in:
Vincent Penquerc'h 2011-12-15 16:42:20 +00:00
parent 4342eea637
commit 3498912d7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opus/gstopusenc.c
View File

@ -188,9 +188,11 @@ gst_opus_enc_class_init (GstOpusEncClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstAudioEncoderClass *base_class; GstAudioEncoderClass *base_class;
GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
base_class = (GstAudioEncoderClass *) klass; base_class = (GstAudioEncoderClass *) klass;
gstelement_class = (GstElementClass *) klass;
gobject_class->set_property = gst_opus_enc_set_property; gobject_class->set_property = gst_opus_enc_set_property;
gobject_class->get_property = gst_opus_enc_get_property; gobject_class->get_property = gst_opus_enc_get_property;

2
ext/opus/gstopusparse.c
View File

@ -295,12 +295,10 @@ gst_opus_parse_parse_frame (GstBaseParse * base, GstBaseParseFrame * frame)
GST_DEBUG_OBJECT (parse, "Found ID header, keeping"); GST_DEBUG_OBJECT (parse, "Found ID header, keeping");
return GST_BASE_PARSE_FLOW_DROPPED; return GST_BASE_PARSE_FLOW_DROPPED;
} else if (is_commentheader) { } else if (is_commentheader) {
gst_buffer_unmap (frame->buffer, data, size);
gst_buffer_replace (&parse->comment_header, frame->buffer); gst_buffer_replace (&parse->comment_header, frame->buffer);
GST_DEBUG_OBJECT (parse, "Found comment header, keeping"); GST_DEBUG_OBJECT (parse, "Found comment header, keeping");
return GST_BASE_PARSE_FLOW_DROPPED; return GST_BASE_PARSE_FLOW_DROPPED;
} }
gst_buffer_unmap (frame->buffer, data, size);
g_slist_foreach (parse->headers, (GFunc) gst_buffer_unref, NULL); g_slist_foreach (parse->headers, (GFunc) gst_buffer_unref, NULL);
parse->headers = NULL; parse->headers = NULL;