summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5aa7229)
raw | patch | inline | side by side (parent: 5aa7229)
author | Edward Hervey <edward.hervey@collabora.co.uk> | |
Wed, 20 Apr 2011 15:37:34 +0000 (17:37 +0200) | ||
committer | Edward Hervey <edward.hervey@collabora.co.uk> | |
Thu, 21 Apr 2011 18:56:45 +0000 (20:56 +0200) |
It is now gone and we need to switch to the new API
See #566605
See #566605
ext/ffmpeg/gstffmpegdemux.c | patch | blob | history | |
ext/ffmpeg/gstffmpegmux.c | patch | blob | history |
index 29aa5919230c83a6f952edf097fde064476eaa88..d8d7be5b3c24beeb9db725bd4d8727b240c06099 100644 (file)
}
}
+#if 0
+ /* Re-enable once converted to new AVMetaData API
+ * See #566605
+ */
static gchar *
my_safe_copy (gchar * input)
{
}
return tlist;
}
+#endif
static gboolean
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;
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++) {
index f2419e7f09de7f52b32de3511120d05f3dd4865c..538aeedb8679b8f3ec0f63f0af208d7f3c897784 100644 (file)
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) {
}
}
+#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) {
ffmpegmux->context->track = i;
}
}
+#endif
/* set the streamheader flag for gstffmpegprotocol if codec supports it */
if (!strcmp (ffmpegmux->context->oformat->name, "flv")) {