From 07feb53dbdcc4b8da5523a7f7a37941272f038c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 1 Nov 2006 13:59:49 +0000 Subject: [PATCH] tag: id3v2: We require a -base more recent than 0.10.9, so it's safe to use Original commit message from CVS: * gst-libs/gst/tag/id3v2frames.c: (parse_picture_frame): We require a -base more recent than 0.10.9, so it's safe to use GST_TYPE_TAG_IMAGE_TYPE unconditionally now. * ext/dv/gstdvdec.c: (gst_dvdec_sink_event): * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_sink_event): Use _newsegment_full() now that we depend on a recent enough core. * gst/wavparse/gstwavparse.c: Remove cruft that we don't need any longer now that we depend on a recent enough -base. --- gst-libs/gst/tag/id3v2frames.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c index 8f4711a7f8..d58d4628de 100644 --- a/gst-libs/gst/tag/id3v2frames.c +++ b/gst-libs/gst/tag/id3v2frames.c @@ -513,14 +513,11 @@ parse_picture_frame (ID3TagsWorking * work) } if (image && image_caps) { - /* FIXME: remove #ifdef once we depend on -base >= 0.10.9 */ -#ifdef GST_TYPE_TAG_IMAGE_TYPE if (pic_type > 0x14) pic_type = GST_TAG_IMAGE_TYPE_UNDEFINED; gst_structure_set (gst_caps_get_structure (image_caps, 0), "image-type", GST_TYPE_TAG_IMAGE_TYPE, (GstTagImageType) pic_type, NULL); -#endif gst_buffer_set_caps (image, image_caps); gst_caps_unref (image_caps);