ffmpeg: Fix some remaining compiler warnings

This commit is contained in:
Sebastian Dröge 2010-03-24 12:36:27 +01:00
parent a450bd027f
commit af3de9ac9f
2 changed files with 20 additions and 22 deletions

View file

@ -41,9 +41,9 @@ typedef struct _PostProcDetails PostProcDetails;
struct _PostProcDetails struct _PostProcDetails
{ {
char *shortname; const char *shortname;
char *longname; const char *longname;
char *description; const char *description;
}; };
static PostProcDetails filterdetails[] = { static PostProcDetails filterdetails[] = {
@ -314,7 +314,7 @@ static void inline
append (gchar ** base, gchar * app) append (gchar ** base, gchar * app)
{ {
gchar *res; gchar *res;
gchar *sep; const gchar *sep;
if (**base && *app) if (**base && *app)
sep = ":"; sep = ":";
@ -352,22 +352,21 @@ gst_post_proc_base_init (GstPostProcClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
GstElementDetails details;
gint ppidx; gint ppidx;
gchar *longname, *description;
ppidx = GPOINTER_TO_INT (g_hash_table_lookup (global_plugins, ppidx = GPOINTER_TO_INT (g_hash_table_lookup (global_plugins,
GINT_TO_POINTER (G_OBJECT_CLASS_TYPE (gobject_class)))); GINT_TO_POINTER (G_OBJECT_CLASS_TYPE (gobject_class))));
details.longname = g_strdup_printf ("LibPostProc %s filter", longname = g_strdup_printf ("LibPostProc %s filter",
filterdetails[ppidx].longname); filterdetails[ppidx].longname);
details.klass = "Filter/Video"; description = g_strdup_printf ("LibPostProc %s",
details.description = g_strdup_printf ("LibPostProc %s",
filterdetails[ppidx].description); filterdetails[ppidx].description);
details.author = gst_element_class_set_details_simple (element_class, longname, "Filter/Video",
"Edward Hervey <edward@fluendo.com>, Mark Nauwelaerts (manauw@skynet.be)"; description,
gst_element_class_set_details (element_class, &details); "Edward Hervey <edward@fluendo.com>, Mark Nauwelaerts (manauw@skynet.be)");
g_free (details.longname); g_free (longname);
g_free (details.description); g_free (description);
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_post_proc_src_template)); gst_static_pad_template_get (&gst_post_proc_src_template));
@ -827,7 +826,7 @@ gst_post_proc_forcequant_get_property (GObject * object, guint prop_id,
} }
gboolean static gboolean
gst_post_proc_register (GstPlugin * plugin) gst_post_proc_register (GstPlugin * plugin)
{ {
GTypeInfo typeinfo = { GTypeInfo typeinfo = {

View file

@ -76,15 +76,11 @@ typedef struct _GstFFMpegScaleClass
#define GST_IS_FFMPEGSCALE_CLASS(klass) \ #define GST_IS_FFMPEGSCALE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGSCALE)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGSCALE))
GType gst_ffmpegscale_get_type (void);
GST_DEBUG_CATEGORY (ffmpegscale_debug); GST_DEBUG_CATEGORY (ffmpegscale_debug);
#define GST_CAT_DEFAULT ffmpegscale_debug #define GST_CAT_DEFAULT ffmpegscale_debug
static const GstElementDetails plugin_details =
GST_ELEMENT_DETAILS ("FFMPEG Scale element",
"Filter/Converter/Video",
"Converts video from one resolution to another",
"Luca Ognibene <luogni@tin.it>, Mark Nauwelaerts <mnauw@users.sf.net>");
/* libswscale supported formats depend on endianness */ /* libswscale supported formats depend on endianness */
#if G_BYTE_ORDER == G_BIG_ENDIAN #if G_BYTE_ORDER == G_BIG_ENDIAN
#define VIDEO_CAPS \ #define VIDEO_CAPS \
@ -197,7 +193,10 @@ gst_ffmpegscale_base_init (gpointer g_class)
gst_static_pad_template_get (&src_factory)); gst_static_pad_template_get (&src_factory));
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_factory)); gst_static_pad_template_get (&sink_factory));
gst_element_class_set_details (element_class, &plugin_details); gst_element_class_set_details_simple (element_class, "FFMPEG Scale element",
"Filter/Converter/Video",
"Converts video from one resolution to another",
"Luca Ognibene <luogni@tin.it>, Mark Nauwelaerts <mnauw@users.sf.net>");
} }
static void static void
@ -787,7 +786,7 @@ gst_ffmpeg_log_callback (void *ptr, int level, const char *fmt, va_list vl)
} }
#endif #endif
gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (ffmpegscale_debug, "ffvideoscale", 0, GST_DEBUG_CATEGORY_INIT (ffmpegscale_debug, "ffvideoscale", 0,