From f16291a6cc30ee3fff1c8d3521f6e683a87b4103 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 20 Apr 2011 17:37:34 +0200
Subject: [PATCH] ffmpeg: Disable code using old metadata API

It is now gone and we need to switch to the new API

See #566605
---
 ext/ffmpeg/gstffmpegdemux.c | 15 +++++++++++++++
 ext/ffmpeg/gstffmpegmux.c   | 11 +++++++++++
 2 files changed, 26 insertions(+)

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 29aa591923..d8d7be5b3c 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1065,6 +1065,10 @@ unknown_caps:
   }
 }
 
+#if 0
+    /* Re-enable once converted to new AVMetaData API
+     * See #566605
+     */
 static gchar *
 my_safe_copy (gchar * input)
 {
@@ -1135,6 +1139,7 @@ gst_ffmpegdemux_read_tags (GstFFMpegDemux * demux)
   }
   return tlist;
 }
+#endif
 
 static gboolean
 gst_ffmpegdemux_open (GstFFMpegDemux * demux)
@@ -1143,7 +1148,12 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
       (GstFFMpegDemuxClass *) G_OBJECT_GET_CLASS (demux);
   gchar *location;
   gint res, n_streams, i;
+#if 0
+  /* Re-enable once converted to new AVMetaData API
+   * See #566605
+   */
   GstTagList *tags;
+#endif
   GstEvent *event;
   GList *cached_events;
 
@@ -1224,12 +1234,17 @@ gst_ffmpegdemux_open (GstFFMpegDemux * demux)
     cached_events = g_list_delete_link (cached_events, cached_events);
   }
 
+#if 0
+  /* Re-enable once converted to new AVMetaData API
+   * See #566605
+   */
   /* grab the global tags */
   tags = gst_ffmpegdemux_read_tags (demux);
   if (tags) {
     GST_INFO_OBJECT (demux, "global tags: %" GST_PTR_FORMAT, tags);
     gst_element_found_tags (GST_ELEMENT (demux), tags);
   }
+#endif
 
   /* now handle the stream tags */
   for (i = 0; i < n_streams; i++) {
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index f2419e7f09..538aeedb86 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -543,7 +543,12 @@ gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
   GSList *collected;
   GstFFMpegMuxPad *best_pad;
   GstClockTime best_time;
+#if 0
+  /* Re-enable once converted to new AVMetaData API
+   * See #566605
+   */
   const GstTagList *tags;
+#endif
 
   /* open "file" (gstreamer protocol to next element) */
   if (!ffmpegmux->opened) {
@@ -594,6 +599,11 @@ gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
       }
     }
 
+#if 0
+    /* Re-enable once converted to new AVMetaData API
+     * See #566605
+     */
+
     /* tags */
     tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (ffmpegmux));
     if (tags) {
@@ -629,6 +639,7 @@ gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
         ffmpegmux->context->track = i;
       }
     }
+#endif
 
     /* set the streamheader flag for gstffmpegprotocol if codec supports it */
     if (!strcmp (ffmpegmux->context->oformat->name, "flv")) {