mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 16:08:51 +00:00
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.
This commit is contained in:
parent
7e54c58ea6
commit
16d56e8a03
4 changed files with 18 additions and 14 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "common"]
|
||||||
|
path = common
|
||||||
|
url = git://anongit.freedesktop.org/gstreamer/common
|
1
common
Submodule
1
common
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit de68be0c16181a66f42fad60319e273097f60245
|
|
@ -94,7 +94,7 @@ static void gst_ffmpegdec_get_property (GObject *object, guint prop_id, GValue *
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
|
|
||||||
//static guint gst_ffmpegdec_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_ffmpegdec_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_ffmpegdec_class_init (GstFFMpegDecClass *klass)
|
gst_ffmpegdec_class_init (GstFFMpegDecClass *klass)
|
||||||
|
@ -173,7 +173,7 @@ gst_ffmpegdec_init(GstFFMpegDec *ffmpegdec)
|
||||||
static void
|
static void
|
||||||
gst_ffmpegdec_chain_audio (GstPad *pad, GstBuffer *inbuf)
|
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;
|
gpointer data;
|
||||||
gint size;
|
gint size;
|
||||||
|
|
||||||
|
@ -332,19 +332,19 @@ gst_ffmpegdec_register (GstPlugin *plugin)
|
||||||
else {
|
else {
|
||||||
goto next;
|
goto next;
|
||||||
}
|
}
|
||||||
// construct the type
|
/* construct the type */
|
||||||
type_name = g_strdup_printf("ffmpeg%s_%s", codec_type, in_plugin->name);
|
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)) {
|
if (g_type_from_name(type_name)) {
|
||||||
g_free(type_name);
|
g_free(type_name);
|
||||||
goto next;
|
goto next;
|
||||||
}
|
}
|
||||||
|
|
||||||
// create the gtk type now
|
/* create the gtk type now */
|
||||||
type = g_type_register_static(GST_TYPE_ELEMENT, type_name , &typeinfo, 0);
|
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 = g_new0 (GstElementDetails,1);
|
||||||
details->longname = g_strdup (in_plugin->name);
|
details->longname = g_strdup (in_plugin->name);
|
||||||
details->klass = "Codec/FFMpeg";
|
details->klass = "Codec/FFMpeg";
|
||||||
|
@ -357,7 +357,7 @@ gst_ffmpegdec_register (GstPlugin *plugin)
|
||||||
GINT_TO_POINTER (type),
|
GINT_TO_POINTER (type),
|
||||||
(gpointer) in_plugin);
|
(gpointer) in_plugin);
|
||||||
|
|
||||||
// register the plugin with gstreamer
|
/* register the plugin with gstreamer */
|
||||||
factory = gst_elementfactory_new(type_name,type,details);
|
factory = gst_elementfactory_new(type_name,type,details);
|
||||||
g_return_val_if_fail(factory != NULL, FALSE);
|
g_return_val_if_fail(factory != NULL, FALSE);
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ static void gst_ffmpegenc_get_property (GObject *object, guint prop_id, GValue *
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
|
|
||||||
//static guint gst_ffmpegenc_signals[LAST_SIGNAL] = { 0 };
|
/*static guint gst_ffmpegenc_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_ffmpegenc_class_init (GstFFMpegEncClass *klass)
|
gst_ffmpegenc_class_init (GstFFMpegEncClass *klass)
|
||||||
|
@ -309,7 +309,7 @@ gst_ffmpegenc_chain_audio (GstPad *pad, GstBuffer *inbuf)
|
||||||
data += frame_size;
|
data += frame_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
// save leftover
|
/* save leftover */
|
||||||
if (size) {
|
if (size) {
|
||||||
memcpy (ffmpegenc->buffer + ffmpegenc->buffer_pos, data, size);
|
memcpy (ffmpegenc->buffer + ffmpegenc->buffer_pos, data, size);
|
||||||
ffmpegenc->buffer_pos += size;
|
ffmpegenc->buffer_pos += size;
|
||||||
|
@ -507,19 +507,19 @@ gst_ffmpegenc_register (GstPlugin *plugin)
|
||||||
else {
|
else {
|
||||||
goto next;
|
goto next;
|
||||||
}
|
}
|
||||||
// construct the type
|
/* construct the type */
|
||||||
type_name = g_strdup_printf("ffmpeg%s_%s", codec_type, in_plugin->name);
|
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)) {
|
if (g_type_from_name(type_name)) {
|
||||||
g_free(type_name);
|
g_free(type_name);
|
||||||
goto next;
|
goto next;
|
||||||
}
|
}
|
||||||
|
|
||||||
// create the gtk type now
|
/* create the gtk type now */
|
||||||
type = g_type_register_static(GST_TYPE_ELEMENT, type_name , &typeinfo, 0);
|
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 = g_new0 (GstElementDetails,1);
|
||||||
details->longname = g_strdup (in_plugin->name);
|
details->longname = g_strdup (in_plugin->name);
|
||||||
details->klass = "Codec/FFMpeg";
|
details->klass = "Codec/FFMpeg";
|
||||||
|
@ -532,7 +532,7 @@ gst_ffmpegenc_register (GstPlugin *plugin)
|
||||||
GINT_TO_POINTER (type),
|
GINT_TO_POINTER (type),
|
||||||
(gpointer) in_plugin);
|
(gpointer) in_plugin);
|
||||||
|
|
||||||
// register the plugin with gstreamer
|
/* register the plugin with gstreamer */
|
||||||
factory = gst_elementfactory_new(type_name,type,details);
|
factory = gst_elementfactory_new(type_name,type,details);
|
||||||
g_return_val_if_fail(factory != NULL, FALSE);
|
g_return_val_if_fail(factory != NULL, FALSE);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue