From b06b11809bd6a9817178b5cbd55a9083652f4cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 10 Apr 2012 00:53:43 +0100 Subject: [PATCH] Use new gst_element_class_set_static_metadata() --- ext/ffmpeg/gstffmpegaudioresample.c | 2 +- ext/ffmpeg/gstffmpegdec.c | 8 ++++---- ext/ffmpeg/gstffmpegdeinterlace.c | 2 +- ext/ffmpeg/gstffmpegdemux.c | 2 +- ext/ffmpeg/gstffmpegenc.c | 4 ++-- ext/ffmpeg/gstffmpegmux.c | 2 +- ext/ffmpeg/gstffmpegscale.c | 2 +- ext/libpostproc/gstpostproc.c | 4 ++-- ext/libswscale/gstffmpegscale.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/ffmpeg/gstffmpegaudioresample.c b/ext/ffmpeg/gstffmpegaudioresample.c index fa165c220c..73d3a0c079 100644 --- a/ext/ffmpeg/gstffmpegaudioresample.c +++ b/ext/ffmpeg/gstffmpegaudioresample.c @@ -109,7 +109,7 @@ gst_ffmpegaudioresample_base_init (gpointer g_class) gst_element_class_add_static_pad_template (element_class, &src_factory); gst_element_class_add_static_pad_template (element_class, &sink_factory); - gst_element_class_set_details_simple (element_class, + gst_element_class_set_static_metadata (element_class, "FFMPEG Audio resampling element", "Filter/Converter/Audio", "Converts audio from one samplerate to another", "Edward Hervey "); diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 23addfd5e2..0927fa6258 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -327,8 +327,8 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass) classification = g_strdup_printf ("Codec/Decoder/%s", (in_plugin->type == AVMEDIA_TYPE_VIDEO) ? "Video" : "Audio"); description = g_strdup_printf ("FFmpeg %s decoder", in_plugin->name); - gst_element_class_set_details_simple (element_class, longname, classification, - description, + gst_element_class_set_static_metadata (element_class, longname, + classification, description, "Wim Taymans , " "Ronald Bultje , " "Edward Hervey "); @@ -1446,8 +1446,8 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force) memcpy (ffmpegdec->format.audio.gst_layout, ffmpegdec->format.audio.ffmpeg_layout, sizeof (GstAudioChannelPosition) * ffmpegdec->format.audio.channels); - gst_audio_channel_positions_to_valid_order (ffmpegdec->format.audio. - gst_layout, ffmpegdec->format.audio.channels); + gst_audio_channel_positions_to_valid_order (ffmpegdec->format. + audio.gst_layout, ffmpegdec->format.audio.channels); GST_LOG_OBJECT (ffmpegdec, "output caps %" GST_PTR_FORMAT, caps); diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/ffmpeg/gstffmpegdeinterlace.c index 238a92c004..2b8e5b32a5 100644 --- a/ext/ffmpeg/gstffmpegdeinterlace.c +++ b/ext/ffmpeg/gstffmpegdeinterlace.c @@ -168,7 +168,7 @@ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details_simple (element_class, + gst_element_class_set_static_metadata (element_class, "FFMPEG Deinterlace element", "Filter/Effect/Video/Deinterlace", "Deinterlace video", "Luca Ognibene "); } diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 24948f8eb9..6896593d27 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -202,7 +202,7 @@ gst_ffmpegdemux_base_init (GstFFMpegDemuxClass * klass) /* construct the element details struct */ longname = g_strdup_printf ("FFmpeg %s demuxer", in_plugin->long_name); description = g_strdup_printf ("FFmpeg %s demuxer", in_plugin->long_name); - gst_element_class_set_details_simple (element_class, longname, + gst_element_class_set_static_metadata (element_class, longname, "Codec/Demuxer", description, "Wim Taymans , " "Ronald Bultje , " diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index da227c32dc..ddf7f8f32c 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -143,8 +143,8 @@ gst_ffmpegenc_base_init (GstFFMpegEncClass * klass) classification = g_strdup_printf ("Codec/Encoder/%s", (in_plugin->type == AVMEDIA_TYPE_VIDEO) ? "Video" : "Audio"); description = g_strdup_printf ("FFmpeg %s encoder", in_plugin->name); - gst_element_class_set_details_simple (element_class, longname, classification, - description, + gst_element_class_set_static_metadata (element_class, longname, + classification, description, "Wim Taymans , " "Ronald Bultje "); g_free (longname); diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c index 773f1c1912..33023ac74d 100644 --- a/ext/ffmpeg/gstffmpegmux.c +++ b/ext/ffmpeg/gstffmpegmux.c @@ -229,7 +229,7 @@ gst_ffmpegmux_base_init (gpointer g_class) description = g_strdup_printf ("FFmpeg %s %s", in_plugin->long_name, is_formatter ? "formatter" : "muxer"); } - gst_element_class_set_details_simple (element_class, longname, + gst_element_class_set_static_metadata (element_class, longname, is_formatter ? "Formatter/Metadata" : "Codec/Muxer", description, "Wim Taymans , " "Ronald Bultje "); diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c index ac5c7e1dd8..f700b2d016 100644 --- a/ext/ffmpeg/gstffmpegscale.c +++ b/ext/ffmpeg/gstffmpegscale.c @@ -105,7 +105,7 @@ gst_ffmpegscale_base_init (gpointer g_class) gst_element_class_add_static_pad_template (element_class, &src_factory); gst_element_class_add_static_pad_template (element_class, &sink_factory); - gst_element_class_set_details_simple (element_class, "FFMPEG Scale element", + gst_element_class_set_static_metadata (element_class, "FFMPEG Scale element", "Filter/Converter/Video/Scaler", "Converts video from one resolution to another", "Luca Ognibene "); diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c index 81ba907492..60fdd0b184 100644 --- a/ext/libpostproc/gstpostproc.c +++ b/ext/libpostproc/gstpostproc.c @@ -365,8 +365,8 @@ gst_post_proc_base_init (GstPostProcClass * klass) filterdetails[ppidx].longname); description = g_strdup_printf ("LibPostProc %s", filterdetails[ppidx].description); - gst_element_class_set_details_simple (element_class, longname, "Filter/Video", - description, + gst_element_class_set_static_metadata (element_class, longname, + "Filter/Video", description, "Edward Hervey , Mark Nauwelaerts (manauw@skynet.be)"); g_free (longname); g_free (description); diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c index 6cbcbcf2ce..d0026a18e5 100644 --- a/ext/libswscale/gstffmpegscale.c +++ b/ext/libswscale/gstffmpegscale.c @@ -195,7 +195,7 @@ gst_ffmpegscale_class_init (GstFFMpegScaleClass * klass) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details_simple (gstelement_class, + gst_element_class_set_static_metadata (gstelement_class, "FFMPEG Scale element", "Filter/Converter/Video", "Converts video from one resolution to another", "Luca Ognibene , Mark Nauwelaerts ");