From a27d8d00a61e919b746b5696ba92f6f3862fb52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 16 Dec 2013 16:07:44 +0100
Subject: [PATCH] id3tag: Read image-description from the info structure, not
 the caps

---
 gst/id3tag/id3tag.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c
index 62bf7dd234..8e3b015783 100644
--- a/gst/id3tag/id3tag.c
+++ b/gst/id3tag/id3tag.c
@@ -726,10 +726,16 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
       s = gst_caps_get_structure (caps, 0);
       mime_type = gst_structure_get_name (s);
       if (mime_type != NULL) {
-        const gchar *desc;
+        const gchar *desc = NULL;
         GstId3v2Frame frame;
         GstMapInfo mapinfo;
         int encoding;
+        const GstStructure *info_struct;
+
+        info_struct = gst_sample_get_info (sample);
+        if (!info_struct
+            || !gst_structure_has_name (info_struct, "GstTagImageInfo"))
+          info_struct = NULL;
 
         /* APIC frame specifies "-->" if we're providing a URL to the image
            rather than directly embedding it */
@@ -741,7 +747,8 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
 
         id3v2_frame_init (&frame, "APIC", 0);
 
-        desc = gst_structure_get_string (s, "image-description");
+        if (info_struct)
+          desc = gst_structure_get_string (info_struct, "image-description");
         if (!desc)
           desc = "";
         encoding = id3v2_tag_string_encoding (id3v2tag, desc);
@@ -752,12 +759,9 @@ add_image_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
         if (strcmp (tag, GST_TAG_PREVIEW_IMAGE) == 0) {
           id3v2_frame_write_uint8 (&frame, ID3V2_APIC_PICTURE_FILE_ICON);
         } else {
-          const GstStructure *info_struct;
           int image_type;
 
-          info_struct = gst_sample_get_info (sample);
-          if (info_struct
-              && gst_structure_has_name (info_struct, "GstTagImageInfo")) {
+          if (info_struct) {
             if (gst_structure_get (info_struct, "image-type",
                     GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) {
               if (image_type > 0 && image_type <= 18) {