diff options
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/avi/gstavidemux.c | 28 | ||||
| -rw-r--r-- | gst/effectv/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/udp/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/videofilter/gstvideotemplate.c | 3 |
4 files changed, 23 insertions, 16 deletions
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); } |