summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-16 16:30:23 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-16 16:30:23 +0000
commit18ab06084c0fb3d1298ba513bf5f63b26e10e65b (patch)
treef284911b15b30afdd04a4d850691b910e81f056a
parent2a4f274b81dd336850b7273c6a4ec3495c84d07e (diff)
downloadgst-plugins-bad-18ab06084c0fb3d1298ba513bf5f63b26e10e65b.tar.gz
gst-plugins-bad-18ab06084c0fb3d1298ba513bf5f63b26e10e65b.tar.bz2
gst-plugins-bad-18ab06084c0fb3d1298ba513bf5f63b26e10e65b.zip
gst/: Uncomment metadata and codec-name handling.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream), (gst_avi_demux_stream_header): * gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state), (gst_qtdemux_add_stream), (qtdemux_parse_tree): Uncomment metadata and codec-name handling.
-rw-r--r--ChangeLog8
-rw-r--r--gst/qtdemux/qtdemux.c23
2 files changed, 12 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fd48d72..6c4b0213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream),
+ (gst_avi_demux_stream_header):
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state),
+ (gst_qtdemux_add_stream), (qtdemux_parse_tree):
+ Uncomment metadata and codec-name handling.
+
2005-08-16 Wim Taymans <wim@fluendo.com>
* configure.ac:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 3a5dbcd2..3d09ef8c 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -476,10 +476,6 @@ gst_qtdemux_change_state (GstElement * element)
qtdemux->last_ts = GST_CLOCK_TIME_NONE;
qtdemux->need_discont = TRUE;
qtdemux->need_flush = FALSE;
- if (qtdemux->tag_list) {
- gst_tag_list_free (qtdemux->tag_list);
- qtdemux->tag_list = NULL;
- }
for (n = 0; n < qtdemux->n_streams; n++) {
gst_element_remove_pad (element, qtdemux->streams[n]->pad);
g_free (qtdemux->streams[n]->samples);
@@ -788,11 +784,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
gst_pad_get_name (stream->pad), stream->pad, qtdemux);
gst_element_add_pad (GST_ELEMENT (qtdemux), stream->pad);
if (list) {
- gst_tag_list_free (list);
-/*
- gst_element_found_tags_for_pad (GST_ELEMENT (qtdemux),
- stream->pad, 0, list);
-*/
+ gst_element_found_tags_for_pad (GST_ELEMENT (qtdemux), stream->pad, list);
}
}
@@ -1860,17 +1852,10 @@ qtdemux_parse_tree (GstQTDemux * qtdemux)
qtdemux_parse_udta (qtdemux, udta);
if (qtdemux->tag_list) {
- GstEvent *event;
- gchar *t;
-
- event = gst_event_new_tag (gst_tag_list_copy (qtdemux->tag_list));
- gst_pad_event_default (qtdemux->sinkpad, event);
- t = gst_structure_to_string (qtdemux->tag_list);
- GST_DEBUG ("calling gst_element_found_tags with %s", t);
- g_free (t);
-/*
+ GST_DEBUG ("calling gst_element_found_tags with %" GST_PTR_FORMAT,
+ qtdemux->tag_list);
gst_element_found_tags (GST_ELEMENT (qtdemux), qtdemux->tag_list);
-*/
+ qtdemux->tag_list = NULL;
}
} else {
GST_LOG ("No udta node found.");