[vlc-commits] vorbis: also check comments for comment metadata

Edward Wang git at videolan.org
Fri May 25 00:48:32 CEST 2012


vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Mon May 21 13:03:00 2012 -0400| [ae4fda5b4ab4d6efaea129d85af5dd95da9784d4] | committer: Jean-Baptiste Kempf

vorbis: also check comments for comment metadata

The comments field is also encoded as "COMMENTS=" instead of description. For example, Audacity encodes the comment box as "COMMENTS=" instead of "DESCRIPTION=".

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ae4fda5b4ab4d6efaea129d85af5dd95da9784d4
---

 modules/demux/vorbis.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/demux/vorbis.h b/modules/demux/vorbis.h
index 2de6bc0..3110c05 100644
--- a/modules/demux/vorbis.h
+++ b/modules/demux/vorbis.h
@@ -155,6 +155,10 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
         else IF_EXTRACT("COPYRIGHT=", Copyright )
         else IF_EXTRACT("ORGANIZATION=", Publisher )
         else IF_EXTRACT("DESCRIPTION=", Description )
+        else if( !hasDescription )
+        {
+            IF_EXTRACT("COMMENTS=", Description )
+        }
         else IF_EXTRACT("GENRE=", Genre )
         else IF_EXTRACT("DATE=", Date )
         else if( !strncasecmp( psz, "METADATA_BLOCK_PICTURE=", strlen("METADATA_BLOCK_PICTURE=")))



More information about the vlc-commits mailing list