diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/matroska/matroska-ids.c | 4 | ||||
| -rw-r--r-- | gst/matroska/matroska-ids.h | 6 |
4 files changed, 8 insertions, 11 deletions
@@ -1,6 +1,13 @@ 2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk> * configure.ac: + * gst/matroska/matroska-ids.c: (gst_matroska_register_tags): + * gst/matroska/matroska-ids.h: + Build depend on core CVS for the attachment tag. + +2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: * gst/matroska/Makefile.am: * gst/matroska/lzo.c: (get_byte), (get_len), (copy), (copy_backptr), (lzo1x_decode), (main): diff --git a/configure.ac b/configure.ac index ccd9770b..09a683ea 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.20 +GST_REQ=0.10.20.1 GSTPB_REQ=0.10.20 dnl *** autotools stuff **** diff --git a/gst/matroska/matroska-ids.c b/gst/matroska/matroska-ids.c index 9d686173..0ee39d31 100644 --- a/gst/matroska/matroska-ids.c +++ b/gst/matroska/matroska-ids.c @@ -112,9 +112,5 @@ gst_matroska_track_init_subtitle_context (GstMatroskaTrackContext ** p_context) void gst_matroska_register_tags (void) { - /* FIXME: Remove this when we depend on core 0.10.21 */ - if (!gst_tag_exists (GST_TAG_ATTACHMENT)) - gst_tag_register (GST_TAG_ATTACHMENT, GST_TAG_FLAG_META, GST_TYPE_BUFFER, - "attachment", "file attached to this stream", gst_tag_merge_use_first); /* TODO: register other custom tags */ } diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index 8a73d37a..19503500 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -580,12 +580,6 @@ gboolean gst_matroska_track_init_video_context (GstMatroskaTrackContext ** p_ gboolean gst_matroska_track_init_audio_context (GstMatroskaTrackContext ** p_context); gboolean gst_matroska_track_init_subtitle_context (GstMatroskaTrackContext ** p_context); - -/* FIXME: remove when we depend on core 0.10.21 */ -#ifndef GST_TAG_ATTACHMENT -#define GST_TAG_ATTACHMENT "attachment" -#endif - void gst_matroska_register_tags (void); #endif /* __GST_MATROSKA_IDS_H__ */ |