mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

fixes for ASF:

Browse source 
Original commit message from CVS:
fixes for ASF:
- merge asfdemux and asfmux into one plugin
- make gstasf a plugin and not a lib (it accidently was one before)
This commit is contained in:
Benjamin Otte 2003-12-19 02:39:38 +00:00
parent a9ed1852b6
commit c9e2afbe42
3 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/asfdemux/Makefile.am
View file

@ -1,14 +1,9 @@
plugin_LTLIBRARIES = libgstasfdemux.la libgstasfmux.la plugin_LTLIBRARIES = libgstasf.la
libgstasfdemux_la_SOURCES = gstasfdemux.c libgstasf_la_SOURCES = gstasfmux.c gstasfdemux.c
libgstasfdemux_la_CFLAGS = $(GST_CFLAGS) libgstasf_la_CFLAGS = $(GST_CFLAGS)
libgstasfdemux_la_LIBADD = libgstasf_la_LIBADD =
libgstasfdemux_la_LDFLAGS = $(GST_LIBS) libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstasfmux_la_SOURCES = gstasfmux.c
libgstasfmux_la_CFLAGS = $(GST_CFLAGS)
libgstasfmux_la_LIBADD =
libgstasfmux_la_LDFLAGS = $(GST_LIBS)
noinst_HEADERS = gstasfdemux.h asfheaders.h gstasfmux.h noinst_HEADERS = gstasfdemux.h asfheaders.h gstasfmux.h

8
gst/asfdemux/gstasfdemux.c
View file

@ -23,6 +23,7 @@
#endif #endif
#include <gst/riff/riff-ids.h> #include <gst/riff/riff-ids.h>
#include "gstasfdemux.h" #include "gstasfdemux.h"
#include "gstasfmux.h" /* for the type registering */
#include "asfheaders.h" #include "asfheaders.h"
/* elementfactory information */ /* elementfactory information */
@ -1627,7 +1628,8 @@ plugin_init (GstPlugin *plugin)
return FALSE; return FALSE;
/* create an elementfactory for the asf_demux element */ /* create an elementfactory for the asf_demux element */
if (!gst_element_register (plugin, "asfdemux", GST_RANK_PRIMARY, GST_TYPE_ASF_DEMUX)) if (!gst_element_register (plugin, "asfdemux", GST_RANK_PRIMARY, GST_TYPE_ASF_DEMUX) ||
!gst_element_register (plugin, "asfmux", GST_RANK_NONE, GST_TYPE_ASFMUX))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -1636,8 +1638,8 @@ plugin_init (GstPlugin *plugin)
GST_PLUGIN_DEFINE ( GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR, GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"asfdemux", "asf",
"Demuxes ASF streams", "Demuxes and muxes audio and video in Microsofts ASF format",
plugin_init, plugin_init,
VERSION, VERSION,
"LGPL", "LGPL",

19
gst/asfdemux/gstasfmux.c
View file

@ -1382,22 +1382,3 @@ gst_asfmux_change_state (GstElement *element)
return GST_STATE_SUCCESS; return GST_STATE_SUCCESS;
} }
static gboolean
plugin_init (GstPlugin *plugin)
{
if (!gst_element_register (plugin, "asfmux", GST_RANK_NONE, GST_TYPE_ASFMUX))
return FALSE;
return TRUE;
}
GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"asfmux",
"Muxes audio and video into an ASF stream",
plugin_init,
VERSION,
"LGPL",
GST_PACKAGE,
GST_ORIGIN)