diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-12 23:55:31 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-12 23:55:31 +0000 |
commit | d681af899ba01e0370d73e4b51b26b5cc4bf3274 (patch) | |
tree | 1c67673f9b40898b8a1def254809dcbfc293736a | |
parent | 8580dd86c9e73a523cc2a78f10541b330598fa6a (diff) |
GST_TYPE_DATE -> G_TYPE_DATE
-rw-r--r-- | gst/apetag/gstapedemux.c | 7 | ||||
-rw-r--r-- | gst/isomp4/gstqtmux.c | 4 | ||||
-rw-r--r-- | gst/matroska/matroska-read-common.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/gst/apetag/gstapedemux.c b/gst/apetag/gstapedemux.c index 838e393f2..25d130e33 100644 --- a/gst/apetag/gstapedemux.c +++ b/gst/apetag/gstapedemux.c @@ -288,15 +288,14 @@ ape_demux_parse_tags (const guint8 * data, gint size) break; } default:{ - if (gst_tag_type == GST_TYPE_DATE) { + if (gst_tag_type == G_TYPE_DATE) { gint v_int; if (sscanf (val, "%d", &v_int) == 1) { GDate *date = g_date_new_dmy (1, 1, v_int); - g_value_init (&v, GST_TYPE_DATE); - gst_value_set_date (&v, date); - g_date_free (date); + g_value_init (&v, G_TYPE_DATE); + g_value_take_boxed (&v, date); } } else { GST_WARNING ("Unhandled tag type '%s' for tag '%s'", diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c index 510747827..e1951f7b4 100644 --- a/gst/isomp4/gstqtmux.c +++ b/gst/isomp4/gstqtmux.c @@ -618,7 +618,7 @@ gst_qt_mux_add_mp4_date (GstQTMux * qtmux, const GstTagList * list, GDateDay day; gchar *str; - g_return_if_fail (gst_tag_get_type (tag) == GST_TYPE_DATE); + g_return_if_fail (gst_tag_get_type (tag) == G_TYPE_DATE); if (!gst_tag_list_get_date (list, tag, &date) || !date) return; @@ -731,7 +731,7 @@ gst_qt_mux_add_3gp_date (GstQTMux * qtmux, const GstTagList * list, GDate *date = NULL; GDateYear year; - g_return_if_fail (gst_tag_get_type (tag) == GST_TYPE_DATE); + g_return_if_fail (gst_tag_get_type (tag) == G_TYPE_DATE); if (!gst_tag_list_get_date (list, tag, &date) || !date) return; diff --git a/gst/matroska/matroska-read-common.c b/gst/matroska/matroska-read-common.c index 2f147eaaa..283b12c2a 100644 --- a/gst/matroska/matroska-read-common.c +++ b/gst/matroska/matroska-read-common.c @@ -652,7 +652,7 @@ gst_matroska_read_common_parse_attached_file (GstMatroskaReadCommon * common, tagsample, NULL); /* the list adds it own ref */ - gst_buffer_unref (tagsample); + gst_sample_unref (tagsample); } g_free (filename); @@ -1449,7 +1449,7 @@ gst_matroska_read_common_parse_metadata_id_simple_tag (GstMatroskaReadCommon * GType dest_type = gst_tag_get_type (tagname_gst); /* Ensure that any date string is complete */ - if (dest_type == GST_TYPE_DATE) { + if (dest_type == G_TYPE_DATE) { guint year = 1901, month = 1, day = 1; /* Dates can be yyyy-MM-dd, yyyy-MM or yyyy, but we need |