summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog21
-rw-r--r--ext/libcaca/Makefile.am4
-rw-r--r--gst/avi/gstavidemux.c28
-rw-r--r--gst/effectv/Makefile.am4
-rw-r--r--gst/udp/Makefile.am4
-rw-r--r--gst/videofilter/gstvideotemplate.c3
6 files changed, 46 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 698265f4..7ea24a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-07-01 Jan Schmidt <thaytan@mad.scientist.com>
+ * ext/libcaca/Makefile.am:
+ * ext/mad/Makefile.am:
+ * gst/effectv/Makefile.am:
+ * gst/udp/Makefile.am:
+ Replace GST_PLUGINS_LIBS_* with GST_PLUGINS_BASE_*
+
+ * ext/mad/gstid3tag.c: (gst_id3_tag_src_query),
+ (gst_id3_tag_src_event), (gst_id3_tag_sink_event),
+ (gst_id3_tag_chain), (plugin_init):
+ * ext/mad/gstmad.c: (gst_mad_src_query), (gst_mad_chain):
+ Signedness warning fix, use gst_pad_get_peer instead of GST_PAD_PEER
+ in querying and event handling, because we're not holding the pad
+ lock and the peer may disappear.
+ * gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
+ (gst_avi_demux_parse_index), (gst_avi_demux_massage_index):
+ Signedness warning fixes.
+
+ * gst/videofilter/gstvideotemplate.c: (plugin_init):
+ Remove gst_library_load
+
2005-06-30 Edward Hervey <edward@fluendo.com>
* gst/avi/Makefile.am: (libgstavi_la_LIBADD):
diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index ce687fc8..ef83e50c 100644
--- a/ext/libcaca/Makefile.am
+++ b/ext/libcaca/Makefile.am
@@ -2,9 +2,9 @@
plugin_LTLIBRARIES = libgstcacasink.la
libgstcacasink_la_SOURCES = gstcacasink.c
-libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS) $(LIBCACA_CFLAGS)
+libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(LIBCACA_CFLAGS)
libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) #\
#$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
-libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_LIBS_LIBS)
+libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
noinst_HEADERS = gstcacasink.h
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index f996ee37..9a888bc7 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -737,6 +737,7 @@ gst_avi_demux_parse_subindex (GstElement * element,
gst_avi_index_entry *entries, *entry;
GList *entries_list = NULL;
GstFormat format = GST_FORMAT_TIME;
+ gint64 tmp;
/* check size */
if (!buf || GST_BUFFER_SIZE (buf) < 24) {
@@ -791,15 +792,19 @@ gst_avi_demux_parse_subindex (GstElement * element,
if (stream->strh->samplesize && stream->strh->type == GST_RIFF_FCC_auds) {
/* constant rate stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
- stream->total_bytes, &format, &entry->ts);
+ stream->total_bytes, &format, &tmp);
+ entry->ts = tmp;
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
- stream->total_bytes + entry->size, &format, &entry->dur);
+ stream->total_bytes + entry->size, &format, &tmp);
+ entry->dur = tmp;
} else {
/* VBR stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
- stream->total_frames, &format, &entry->ts);
+ stream->total_frames, &format, &tmp);
+ entry->ts = tmp;
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
- stream->total_frames + 1, &format, &entry->dur);
+ stream->total_frames + 1, &format, &tmp);
+ entry->dur = tmp;
}
entry->dur -= entry->ts;
@@ -1156,6 +1161,7 @@ gst_avi_demux_parse_index (GstElement * element,
gint stream_nr;
gst_avi_index_entry *target;
GstFormat format;
+ gint64 ts;
_entry = &((gst_riff_index_entry *) data)[i];
entry.id = GUINT32_FROM_LE (_entry->id);
@@ -1202,15 +1208,19 @@ gst_avi_demux_parse_index (GstElement * element,
if (stream->strh->samplesize && stream->strh->type == GST_RIFF_FCC_auds) {
/* constant rate stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
- stream->total_bytes, &format, &target->ts);
+ stream->total_bytes, &format, &ts);
+ target->ts = ts;
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
- stream->total_bytes + target->size, &format, &target->dur);
+ stream->total_bytes + target->size, &format, &ts);
+ target->dur = ts;
} else {
/* VBR stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
- stream->total_frames, &format, &target->ts);
+ stream->total_frames, &format, &ts);
+ target->ts = ts;
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
- stream->total_frames + 1, &format, &target->dur);
+ stream->total_frames + 1, &format, &ts);
+ target->dur = ts;
}
target->dur -= target->ts;
@@ -1592,7 +1602,7 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
/* init frames */
for (i = 0; i < avi->num_streams; i++) {
GstFormat fmt = GST_FORMAT_TIME;
- guint64 delay = 0;
+ gint64 delay = 0;
stream = &avi->stream[i];
if (stream->strh->type == GST_RIFF_FCC_vids) {
diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index dc6257d4..333f3409 100644
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -2,8 +2,8 @@
plugin_LTLIBRARIES = libgsteffectv.la
libgsteffectv_la_SOURCES = gsteffectv.c gstedge.c gstaging.c gstdice.c gstwarp.c gstshagadelic.c gstvertigo.c gstrev.c gstquark.c
-libgsteffectv_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS) -I$(top_srcdir)/gst/videofilter
+libgsteffectv_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -I$(top_srcdir)/gst/videofilter
libgsteffectv_la_LIBADD = $(top_builddir)/gst/videofilter/libgstvideofilter-0.9.la
-libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_LIBS_LIBS)
+libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS)
noinst_HEADERS = gsteffectv.h
diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index a72c7351..b82b3702 100644
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -13,9 +13,9 @@ built_headers = gstudp-enumtypes.h gstudp-marshal.h
BUILT_SOURCES = $(built_sources) $(built_headers)
libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c
-libgstudp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS)
+libgstudp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstudp_la_LIBADD =
-libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_LIBS_LIBS) -lgstnet-0.9
+libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstnet-0.9
nodist_libgstudp_la_SOURCES = \
$(built_sources)
diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c
index 93a6cfaa..4cfe14fd 100644
--- a/gst/videofilter/gstvideotemplate.c
+++ b/gst/videofilter/gstvideotemplate.c
@@ -219,9 +219,6 @@ gst_videotemplate_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_library_load ("gstvideofilter"))
- return FALSE;
-
return gst_element_register (plugin, "videotemplate", GST_RANK_NONE,
GST_TYPE_VIDEOTEMPLATE);
}
generated by cgit (git 2.34.1) at 2024-06-24 01:35:15 +0000