From 7951e1cceb92e5b9176fb896ca33d5b191baa516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 14 Dec 2007 10:17:10 +0000 Subject: [PATCH] gst/id3demux/id3v2frames.c: Parse WOAF frames and put the result into GST_TAG_CONTACT, which is where it would end up... Original commit message from CVS: * gst/id3demux/id3v2frames.c: (parse_url_link_frame): Parse WOAF frames and put the result into GST_TAG_CONTACT, which is where it would end up if the same information was put in a vorbis comment (don't think it's worth adding a new URI tag for this). Fixes #488112. --- ChangeLog | 8 ++++++++ common | 2 +- gst/id3demux/id3v2frames.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2af6750ccb..00c246361b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-12-14 Tim-Philipp Müller + + * gst/id3demux/id3v2frames.c: (parse_url_link_frame): + Parse WOAF frames and put the result into GST_TAG_CONTACT, + which is where it would end up if the same information was + put in a vorbis comment (don't think it's worth adding a + new URI tag for this). Fixes #488112. + 2007-12-11 Tim-Philipp Müller * configure.ac: diff --git a/common b/common index 423e2ea96b..ea5f2cfab1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 423e2ea96b5f79281f4dd20d734bd968b3d95e89 +Subproject commit ea5f2cfab1a164a5d285fe745343cbe0a476a904 diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c index c8acb886cd..b67f356d4d 100644 --- a/gst/id3demux/id3v2frames.c +++ b/gst/id3demux/id3v2frames.c @@ -348,6 +348,11 @@ parse_url_link_frame (ID3TagsWorking * work, const gchar ** tag_name) *tag_name = GST_TAG_LICENSE_URI; else *tag_name = GST_TAG_COPYRIGHT_URI; + } else if (strcmp (work->frame_id, "WOAF") == 0) { + /* can't be bothered to create a CONTACT_URI tag for this, so let's just + * put into into GST_TAG_CONTACT, which is where it ends up when reading + * the info from vorbis comments as well */ + *tag_name = GST_TAG_CONTACT; } return link;