mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Replace GST_PLUGINS_LIBS_* with GST_PLUGINS_BASE_*

Browse source 
Original commit message from CVS:
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
This commit is contained in:
Jan Schmidt 2005-07-01 08:10:56 +00:00
parent dc8cfd3f48
commit 53b2e78562
6 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -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> 2005-06-30 Edward Hervey <edward@fluendo.com>
* gst/avi/Makefile.am: (libgstavi_la_LIBADD): * gst/avi/Makefile.am: (libgstavi_la_LIBADD):

4
ext/libcaca/Makefile.am
View file

@ -2,9 +2,9 @@
plugin_LTLIBRARIES = libgstcacasink.la plugin_LTLIBRARIES = libgstcacasink.la
libgstcacasink_la_SOURCES = gstcacasink.c 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) #\ libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) #\
#$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la #$(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 noinst_HEADERS = gstcacasink.h

28
gst/avi/gstavidemux.c
View file

@ -737,6 +737,7 @@ gst_avi_demux_parse_subindex (GstElement * element,
gst_avi_index_entry *entries, *entry; gst_avi_index_entry *entries, *entry;
GList *entries_list = NULL; GList *entries_list = NULL;
GstFormat format = GST_FORMAT_TIME; GstFormat format = GST_FORMAT_TIME;
gint64 tmp;
/* check size */ /* check size */
if (!buf || GST_BUFFER_SIZE (buf) < 24) { 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) { if (stream->strh->samplesize && stream->strh->type == GST_RIFF_FCC_auds) {
/* constant rate stream */ /* constant rate stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES, 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, 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 { } else {
/* VBR stream */ /* VBR stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT, 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, 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; entry->dur -= entry->ts;
@ -1156,6 +1161,7 @@ gst_avi_demux_parse_index (GstElement * element,
gint stream_nr; gint stream_nr;
gst_avi_index_entry *target; gst_avi_index_entry *target;
GstFormat format; GstFormat format;
gint64 ts;
_entry = &((gst_riff_index_entry *) data)[i]; _entry = &((gst_riff_index_entry *) data)[i];
entry.id = GUINT32_FROM_LE (_entry->id); 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) { if (stream->strh->samplesize && stream->strh->type == GST_RIFF_FCC_auds) {
/* constant rate stream */ /* constant rate stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES, 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, 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 { } else {
/* VBR stream */ /* VBR stream */
gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT, 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, 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; target->dur -= target->ts;
@ -1592,7 +1602,7 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
/* init frames */ /* init frames */
for (i = 0; i < avi->num_streams; i++) { for (i = 0; i < avi->num_streams; i++) {
GstFormat fmt = GST_FORMAT_TIME; GstFormat fmt = GST_FORMAT_TIME;
guint64 delay = 0; gint64 delay = 0;
stream = &avi->stream[i]; stream = &avi->stream[i];
if (stream->strh->type == GST_RIFF_FCC_vids) { if (stream->strh->type == GST_RIFF_FCC_vids) {

4
gst/effectv/Makefile.am
View file

@ -2,8 +2,8 @@
plugin_LTLIBRARIES = libgsteffectv.la 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_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_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 noinst_HEADERS = gsteffectv.h

4
gst/udp/Makefile.am
View file

@ -13,9 +13,9 @@ built_headers = gstudp-enumtypes.h gstudp-marshal.h
BUILT_SOURCES = $(built_sources) $(built_headers) BUILT_SOURCES = $(built_sources) $(built_headers)
libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c 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_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 = \ nodist_libgstudp_la_SOURCES = \
$(built_sources) $(built_sources)

3
gst/videofilter/gstvideotemplate.c
View file

@ -219,9 +219,6 @@ gst_videotemplate_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
if (!gst_library_load ("gstvideofilter"))
return FALSE;
return gst_element_register (plugin, "videotemplate", GST_RANK_NONE, return gst_element_register (plugin, "videotemplate", GST_RANK_NONE,
GST_TYPE_VIDEOTEMPLATE); GST_TYPE_VIDEOTEMPLATE);
} }