diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-09-16 15:32:24 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-09-16 15:32:24 +0200 |
| commit | eed915b05e946bded73701f54b2784a1c791ac8f (patch) | |
| tree | 2134056956377a5d71fd465bf2b6cbf270511ad1 /ext | |
| parent | c4e0aff12b238dd3a46614278d2721ec75f2463e (diff) | |
vp8: Apply remaining changes that got lost while moving the plugin via git am thanks to merges
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/vp8/gstvp8dec.c | 10 | ||||
| -rw-r--r-- | ext/vp8/gstvp8enc.c | 29 |
2 files changed, 4 insertions, 35 deletions
diff --git a/ext/vp8/gstvp8dec.c b/ext/vp8/gstvp8dec.c index a45bf72d3..b03802ac3 100644 --- a/ext/vp8/gstvp8dec.c +++ b/ext/vp8/gstvp8dec.c @@ -166,16 +166,6 @@ gst_vp8_dec_class_init (GstVP8DecClass * klass) 0, 16, DEFAULT_NOISE_LEVEL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_static_pad_template (element_class, - &gst_vp8_dec_src_template); - gst_element_class_add_static_pad_template (element_class, - &gst_vp8_dec_sink_template); - - gst_element_class_set_details_simple (element_class, - "On2 VP8 Decoder", - "Codec/Decoder/Video", - "Decode VP8 video streams", "David Schleef <ds@entropywave.com>"); - g_object_class_install_property (gobject_class, PROP_THREADS, g_param_spec_uint ("threads", "Max Threads", "Maximum number of decoding threads", diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c index 2754f560d..6b122f649 100644 --- a/ext/vp8/gstvp8enc.c +++ b/ext/vp8/gstvp8enc.c @@ -382,31 +382,10 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("video/x-vp8, " "profile = (string) {0, 1, 2, 3}") ); -<<<<<<< -static void -do_init (GType vp8enc_type) -{ - static const GInterfaceInfo tag_setter_info = { NULL, NULL, NULL }; - const GInterfaceInfo preset_interface_info = { - NULL, /* interface_init */ - NULL, /* interface_finalize */ - NULL /* interface_data */ - }; - - g_type_add_interface_static (vp8enc_type, GST_TYPE_TAG_SETTER, - &tag_setter_info); - g_type_add_interface_static (vp8enc_type, GST_TYPE_PRESET, - &preset_interface_info); -} - -GST_BOILERPLATE_FULL (GstVP8Enc, gst_vp8_enc, GstVideoEncoder, - GST_TYPE_VIDEO_ENCODER, do_init); -======= #define parent_class gst_vp8_enc_parent_class G_DEFINE_TYPE_WITH_CODE (GstVP8Enc, gst_vp8_enc, GST_TYPE_VIDEO_ENCODER, G_IMPLEMENT_INTERFACE (GST_TYPE_TAG_SETTER, NULL); G_IMPLEMENT_INTERFACE (GST_TYPE_PRESET, NULL);); ->>>>>>> static void gst_vp8_enc_class_init (GstVP8EncClass * klass) @@ -423,10 +402,10 @@ gst_vp8_enc_class_init (GstVP8EncClass * klass) gobject_class->get_property = gst_vp8_enc_get_property; gobject_class->finalize = gst_vp8_enc_finalize; - gst_element_class_add_static_pad_template (element_class, - &gst_vp8_enc_src_template); - gst_element_class_add_static_pad_template (element_class, - &gst_vp8_enc_sink_template); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_vp8_enc_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_vp8_enc_sink_template)); gst_element_class_set_metadata (element_class, "On2 VP8 Encoder", |