mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 16:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

id3demux: ensure a taglist before adding the container tag

Browse source 
In the case of id3v1 also don't return NULL on empty tags, but also create a new
taglist and add the container tag for consistency.
This commit is contained in:
Stefan Kost 2011-02-08 10:07:43 +02:00
parent 6f6b2a7efc
commit a86bab6689
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/id3demux/gstid3demux.c
View file

@ -25,7 +25,7 @@
* id3demux accepts data streams with either (or both) ID3v2 regions at the
* start, or ID3v1 at the end. The mime type of the data between the tag blocks
* is detected using typefind functions, and the appropriate output mime type
* set on outgoing buffers.
* set on outgoing buffers.
*
* The element is only able to read ID3v1 tags from a seekable stream, because
* they are at the end of the stream. That is, when get_range mode is supported
@ -183,6 +183,8 @@ gst_id3demux_parse_tag (GstTagDemux * demux, GstBuffer * buffer,
res = id3demux_read_id3v2_tag (buffer, tag_size, tags);
if (G_LIKELY (res == ID3TAGS_READ_TAG)) {
if (*tags == NULL)
*tags = gst_tag_list_new ();
gst_id3demux_add_container_format (*tags);
return GST_TAG_DEMUX_RESULT_OK;
} else {
@ -191,9 +193,8 @@ gst_id3demux_parse_tag (GstTagDemux * demux, GstBuffer * buffer,
} else {
*tags = gst_tag_list_new_from_id3v1 (GST_BUFFER_DATA (buffer));
if (G_UNLIKELY (*tags == NULL))
return GST_TAG_DEMUX_RESULT_BROKEN_TAG;
if (*tags == NULL)
*tags = gst_tag_list_new ();
gst_id3demux_add_container_format (*tags);
*tag_size = ID3V1_TAG_SIZE;
return GST_TAG_DEMUX_RESULT_OK;