summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-11-01 13:59:49 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-11-01 13:59:49 +0000
commit93c5c6fcbabafb56a8f872d8922e85360b635faf (patch)
tree4b6c64404ce0ade53de8b5aec540106140b5c8f8 /gst
parenta0eefe10e2996a204f0118dbdf05109879a3d2f6 (diff)
gst/id3demux/id3v2frames.c: We require a -base more recent than 0.10.9, so it's safe to use
Original commit message from CVS: * gst/id3demux/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.
Diffstat (limited to 'gst')
-rw-r--r--gst/id3demux/id3v2frames.c3
-rw-r--r--gst/wavparse/gstwavparse.c5
2 files changed, 0 insertions, 8 deletions
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c
index 8f4711a7..d58d4628 100644
--- a/gst/id3demux/id3v2frames.c
+++ b/gst/id3demux/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);
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index cf5ede8c..e6a14483 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -60,11 +60,6 @@
#include "gst/riff/riff-media.h"
#include <gst/gst-i18n-plugin.h>
-/* FIXME: remove again when we depend on -base >= 0.10.9.1 */
-#ifndef GST_RIFF_TAG_fact
-#define GST_RIFF_TAG_fact GST_MAKE_FOURCC ('f','a','c','t')
-#endif
-
GST_DEBUG_CATEGORY_STATIC (wavparse_debug);
#define GST_CAT_DEFAULT (wavparse_debug)