mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "id3demux: ensure a taglist before adding the container tag"

Browse source 
This reverts commit a86bab6689. The issue is
fixed with commit ff5e5a8f0d instead.
This commit is contained in:
Stefan Kost 2011-02-22 15:20:11 +02:00
parent ff5e5a8f0d
commit 98501f6f45
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/id3demux/gstid3demux.c
View file

@ -183,8 +183,6 @@ gst_id3demux_parse_tag (GstTagDemux * demux, GstBuffer * buffer,
res = id3demux_read_id3v2_tag (buffer, tag_size, tags); res = id3demux_read_id3v2_tag (buffer, tag_size, tags);
if (G_LIKELY (res == ID3TAGS_READ_TAG)) { if (G_LIKELY (res == ID3TAGS_READ_TAG)) {
if (*tags == NULL)
*tags = gst_tag_list_new ();
gst_id3demux_add_container_format (*tags); gst_id3demux_add_container_format (*tags);
return GST_TAG_DEMUX_RESULT_OK; return GST_TAG_DEMUX_RESULT_OK;
} else { } else {
@ -193,8 +191,9 @@ gst_id3demux_parse_tag (GstTagDemux * demux, GstBuffer * buffer,
} else { } else {
*tags = gst_tag_list_new_from_id3v1 (GST_BUFFER_DATA (buffer)); *tags = gst_tag_list_new_from_id3v1 (GST_BUFFER_DATA (buffer));
if (*tags == NULL) if (G_UNLIKELY (*tags == NULL))
*tags = gst_tag_list_new (); return GST_TAG_DEMUX_RESULT_BROKEN_TAG;
gst_id3demux_add_container_format (*tags); gst_id3demux_add_container_format (*tags);
*tag_size = ID3V1_TAG_SIZE; *tag_size = ID3V1_TAG_SIZE;
return GST_TAG_DEMUX_RESULT_OK; return GST_TAG_DEMUX_RESULT_OK;