summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-03-19 04:09:41 +0000
committerAndy Wingo <wingo@pobox.com>2002-03-19 04:09:41 +0000
commit16d56e8a03194c854f5037df9117ae5154879b7a (patch)
tree5d578dcc2cfdf519679df2a7488647d918c70aaf
parent7e54c58ea624fa5ac373225f39c0d8789aeb04fd (diff)
downloadgst-libav-16d56e8a03194c854f5037df9117ae5154879b7a.tar.gz
removal of //-style comments don't link plugins to core libs -- the versioning is done internally to the plugins with...
Original commit message from CVS: * removal of //-style comments * don't link plugins to core libs -- the versioning is done internally to the plugins with the plugin_info struct, and symbol resolution is lazy, so we can always know if a plugin can be loaded by the plugin_info data. in theory.
-rw-r--r--.gitmodules3
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegdec.c14
-rw-r--r--ext/ffmpeg/gstffmpegenc.c14
4 files changed, 17 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1ba590b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common"]
+ path = common
+ url = git://anongit.freedesktop.org/gstreamer/common
diff --git a/common b/common
new file mode 160000
+Subproject de68be0c16181a66f42fad60319e273097f6024
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index f851719..6726a5b 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -94,7 +94,7 @@ static void gst_ffmpegdec_get_property (GObject *object, guint prop_id, GValue *
static GstElementClass *parent_class = NULL;
-//static guint gst_ffmpegdec_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_ffmpegdec_signals[LAST_SIGNAL] = { 0 }; */
static void
gst_ffmpegdec_class_init (GstFFMpegDecClass *klass)
@@ -173,7 +173,7 @@ gst_ffmpegdec_init(GstFFMpegDec *ffmpegdec)
static void
gst_ffmpegdec_chain_audio (GstPad *pad, GstBuffer *inbuf)
{
- //GstFFMpegDec *ffmpegdec = (GstFFMpegDec *)(gst_pad_get_parent (pad));
+ /*GstFFMpegDec *ffmpegdec = (GstFFMpegDec *)(gst_pad_get_parent (pad)); */
gpointer data;
gint size;
@@ -332,19 +332,19 @@ gst_ffmpegdec_register (GstPlugin *plugin)
else {
goto next;
}
- // construct the type
+ /* construct the type */
type_name = g_strdup_printf("ffmpeg%s_%s", codec_type, in_plugin->name);
- // if it's already registered, drop it
+ /* if it's already registered, drop it */
if (g_type_from_name(type_name)) {
g_free(type_name);
goto next;
}
- // create the gtk type now
+ /* create the gtk type now */
type = g_type_register_static(GST_TYPE_ELEMENT, type_name , &typeinfo, 0);
- // construct the element details struct
+ /* construct the element details struct */
details = g_new0 (GstElementDetails,1);
details->longname = g_strdup (in_plugin->name);
details->klass = "Codec/FFMpeg";
@@ -357,7 +357,7 @@ gst_ffmpegdec_register (GstPlugin *plugin)
GINT_TO_POINTER (type),
(gpointer) in_plugin);
- // register the plugin with gstreamer
+ /* register the plugin with gstreamer */
factory = gst_elementfactory_new(type_name,type,details);
g_return_val_if_fail(factory != NULL, FALSE);
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 8e752c3..8369683 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -119,7 +119,7 @@ static void gst_ffmpegenc_get_property (GObject *object, guint prop_id, GValue *
static GstElementClass *parent_class = NULL;
-//static guint gst_ffmpegenc_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_ffmpegenc_signals[LAST_SIGNAL] = { 0 }; */
static void
gst_ffmpegenc_class_init (GstFFMpegEncClass *klass)
@@ -309,7 +309,7 @@ gst_ffmpegenc_chain_audio (GstPad *pad, GstBuffer *inbuf)
data += frame_size;
}
- // save leftover
+ /* save leftover */
if (size) {
memcpy (ffmpegenc->buffer + ffmpegenc->buffer_pos, data, size);
ffmpegenc->buffer_pos += size;
@@ -507,19 +507,19 @@ gst_ffmpegenc_register (GstPlugin *plugin)
else {
goto next;
}
- // construct the type
+ /* construct the type */
type_name = g_strdup_printf("ffmpeg%s_%s", codec_type, in_plugin->name);
- // if it's already registered, drop it
+ /* if it's already registered, drop it */
if (g_type_from_name(type_name)) {
g_free(type_name);
goto next;
}
- // create the gtk type now
+ /* create the gtk type now */
type = g_type_register_static(GST_TYPE_ELEMENT, type_name , &typeinfo, 0);
- // construct the element details struct
+ /* construct the element details struct */
details = g_new0 (GstElementDetails,1);
details->longname = g_strdup (in_plugin->name);
details->klass = "Codec/FFMpeg";
@@ -532,7 +532,7 @@ gst_ffmpegenc_register (GstPlugin *plugin)
GINT_TO_POINTER (type),
(gpointer) in_plugin);
- // register the plugin with gstreamer
+ /* register the plugin with gstreamer */
factory = gst_elementfactory_new(type_name,type,details);
g_return_val_if_fail(factory != NULL, FALSE);