From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Wed, 16 Mar 2011 08:35:50 +0000 (+0100)
Subject: matroskademux: Use ARTIST Matroska tag instead of AUTHOR for GST_TAG_ARTIST
X-Git-Tag: RELEASE-0.10.29~518
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52aa27f997f117c0e456596df96713e9901eb959;p=platform%2Fupstream%2Fgst-plugins-good.git

matroskademux: Use ARTIST Matroska tag instead of AUTHOR for GST_TAG_ARTIST

AUTHOR only existed in an old version of the spec and ARTIST is
the new replacement for this. We are still reading both to still
be compatible with old files.

Fixes bug #644875.
---

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 401554b43..67ff3f116 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2689,8 +2689,8 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
         entry->pos + demux->ebml_segment_start);
   }
 
-  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
-  keyunit = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
+  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
+  keyunit = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
 
   if (flush) {
     GST_DEBUG_OBJECT (demux, "Starting flush");
@@ -3639,6 +3639,7 @@ gst_matroska_demux_parse_metadata_id_simple_tag (GstMatroskaDemux * demux,
   tag_conv[] = {
     {
     GST_MATROSKA_TAG_ID_TITLE, GST_TAG_TITLE}, {
+    GST_MATROSKA_TAG_ID_ARTIST, GST_TAG_ARTIST}, {
     GST_MATROSKA_TAG_ID_AUTHOR, GST_TAG_ARTIST}, {
     GST_MATROSKA_TAG_ID_ALBUM, GST_TAG_ALBUM}, {
     GST_MATROSKA_TAG_ID_COMMENTS, GST_TAG_COMMENT}, {
diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h
index 3bb0610fe..9027add1b 100644
--- a/gst/matroska/matroska-ids.h
+++ b/gst/matroska/matroska-ids.h
@@ -395,6 +395,7 @@
 
 #define GST_MATROSKA_TAG_ID_TITLE    "TITLE"
 #define GST_MATROSKA_TAG_ID_AUTHOR   "AUTHOR"
+#define GST_MATROSKA_TAG_ID_ARTIST   "ARTIST"
 #define GST_MATROSKA_TAG_ID_ALBUM    "ALBUM"
 #define GST_MATROSKA_TAG_ID_COMMENTS "COMMENTS"
 #define GST_MATROSKA_TAG_ID_BITSPS   "BITSPS"