summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--ext/dv/gstdvdec.c11
-rw-r--r--ext/jpeg/gstjpegdec.c11
-rw-r--r--gst/id3demux/id3v2frames.c3
-rw-r--r--gst/wavparse/gstwavparse.c5
5 files changed, 24 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 1407da08..a766bf0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-11-01 Tim-Philipp Müller <tim at centricular dot net>
+
+ * 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.
+
2006-10-31 Wim Taymans <wim@fluendo.com>
* gst/rtp/Makefile.am:
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 501c57bd..1e7fa8e6 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -311,21 +311,20 @@ gst_dvdec_sink_event (GstPad * pad, GstEvent * event)
break;
case GST_EVENT_NEWSEGMENT:{
gboolean update;
- gdouble rate;
+ gdouble rate, applied_rate;
GstFormat format;
gint64 start, stop, position;
- /* Once -good depends on core >= 0.10.6, use newsegment_full */
- gst_event_parse_new_segment (event, &update, &rate, &format,
- &start, &stop, &position);
+ gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
+ &format, &start, &stop, &position);
GST_DEBUG_OBJECT (dvdec, "Got NEWSEGMENT [%" GST_TIME_FORMAT
" - %" GST_TIME_FORMAT " / %" GST_TIME_FORMAT "]",
GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
GST_TIME_ARGS (position));
- gst_segment_set_newsegment (dvdec->segment, update, rate, format,
- start, stop, position);
+ gst_segment_set_newsegment_full (dvdec->segment, update, rate,
+ applied_rate, format, start, stop, position);
break;
}
default:
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index b5d9985f..f84aea6e 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -1072,21 +1072,20 @@ gst_jpeg_dec_sink_event (GstPad * pad, GstEvent * event)
break;
case GST_EVENT_NEWSEGMENT:{
gboolean update;
- gdouble rate;
+ gdouble rate, applied_rate;
GstFormat format;
gint64 start, stop, position;
- /* Once -good depends on core >= 0.10.6, use newsegment_full */
- gst_event_parse_new_segment (event, &update, &rate, &format,
- &start, &stop, &position);
+ gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
+ &format, &start, &stop, &position);
GST_DEBUG_OBJECT (dec, "Got NEWSEGMENT [%" GST_TIME_FORMAT
" - %" GST_TIME_FORMAT " / %" GST_TIME_FORMAT "]",
GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
GST_TIME_ARGS (position));
- gst_segment_set_newsegment (dec->segment, update, rate, format,
- start, stop, position);
+ gst_segment_set_newsegment_full (dec->segment, update, rate,
+ applied_rate, format, start, stop, position);
break;
}
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)