Build depend on core CVS for the attachment tag.

Original commit message from CVS:
* 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.
This commit is contained in:
Sebastian Dröge 2008-08-02 18:20:44 +00:00
parent c4912dac78
commit 25bc74b8a6
4 changed files with 8 additions and 11 deletions

View file

@ -1,3 +1,10 @@
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> 2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* configure.ac: * configure.ac:

View file

@ -47,7 +47,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff *** dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.20 GST_REQ=0.10.20.1
GSTPB_REQ=0.10.20 GSTPB_REQ=0.10.20
dnl *** autotools stuff **** dnl *** autotools stuff ****

View file

@ -112,9 +112,5 @@ gst_matroska_track_init_subtitle_context (GstMatroskaTrackContext ** p_context)
void void
gst_matroska_register_tags (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 */ /* TODO: register other custom tags */
} }

View file

@ -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_audio_context (GstMatroskaTrackContext ** p_context);
gboolean gst_matroska_track_init_subtitle_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); void gst_matroska_register_tags (void);
#endif /* __GST_MATROSKA_IDS_H__ */ #endif /* __GST_MATROSKA_IDS_H__ */