mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-18 05:16:05 +00:00
opus: fix bad merge (stray unmap, undeclared var)
This commit is contained in:
parent
4342eea637
commit
3498912d7b
2 changed files with 2 additions and 2 deletions
|
@ -188,9 +188,11 @@ gst_opus_enc_class_init (GstOpusEncClass * klass)
|
|||
{
|
||||
GObjectClass *gobject_class;
|
||||
GstAudioEncoderClass *base_class;
|
||||
GstElementClass *gstelement_class;
|
||||
|
||||
gobject_class = (GObjectClass *) klass;
|
||||
base_class = (GstAudioEncoderClass *) klass;
|
||||
gstelement_class = (GstElementClass *) klass;
|
||||
|
||||
gobject_class->set_property = gst_opus_enc_set_property;
|
||||
gobject_class->get_property = gst_opus_enc_get_property;
|
||||
|
|
|
@ -295,12 +295,10 @@ gst_opus_parse_parse_frame (GstBaseParse * base, GstBaseParseFrame * frame)
|
|||
GST_DEBUG_OBJECT (parse, "Found ID header, keeping");
|
||||
return GST_BASE_PARSE_FLOW_DROPPED;
|
||||
} else if (is_commentheader) {
|
||||
gst_buffer_unmap (frame->buffer, data, size);
|
||||
gst_buffer_replace (&parse->comment_header, frame->buffer);
|
||||
GST_DEBUG_OBJECT (parse, "Found comment header, keeping");
|
||||
return GST_BASE_PARSE_FLOW_DROPPED;
|
||||
}
|
||||
gst_buffer_unmap (frame->buffer, data, size);
|
||||
|
||||
g_slist_foreach (parse->headers, (GFunc) gst_buffer_unref, NULL);
|
||||
parse->headers = NULL;
|
||||
|
|
Loading…
Reference in a new issue