From 4e44f37abdb569b0a1c42b9ca9b9e6d5c6d368fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 28 Jan 2015 17:44:57 +0100 Subject: [PATCH] video-converter: Fix compiler warnings video-converter.c:3073:48: error: implicit conversion from enumeration type 'GstFormat' to different enumeration type 'GstVideoFormat' [-Werror,-Wenum-conversion] gst_video_scaler_horizontal (h_scaler, format, ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~ video-converter.c:3081:44: error: implicit conversion from enumeration type 'GstFormat' to different enumeration type 'GstVideoFormat' [-Werror,-Wenum-conversion] gst_video_scaler_vertical (v_scaler, format, lines, d, i, out_w); ~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~ video-converter.c:3137:24: error: implicit conversion from enumeration type 'const GstVideoFormat' to different enumeration type 'GstFormat' [-Werror,-Wenum-conversion] convert->fformat = GST_VIDEO_INFO_FORMAT (in_info); ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../../gst-libs/gst/video/video-info.h:125:43: note: expanded from macro 'GST_VIDEO_INFO_FORMAT' ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../../gst-libs/gst/video/video-format.h:361:59: note: expanded from macro 'GST_VIDEO_FORMAT_INFO_FORMAT' ~~~~~~~~^~~~~~ video-converter.c:3157:24: error: implicit conversion from enumeration type 'GstVideoFormat' to different enumeration type 'GstFormat' [-Werror,-Wenum-conversion] convert->fformat = GST_VIDEO_FORMAT_GRAY8; --- gst-libs/gst/video/video-converter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index a1da26b12d..530647761e 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -242,7 +242,7 @@ struct _GstVideoConverter GstVideoFrame *dest; /* fastpath */ - GstFormat fformat; + GstVideoFormat fformat; GstVideoScaler *fh_scaler[4]; GstVideoScaler *fv_scaler[4]; ConverterAlloc *flines; @@ -3041,7 +3041,7 @@ convert_scale_planes (GstVideoConverter * convert, const GstVideoFrame * src, GstVideoFrame * dest) { int k, n_planes; - GstFormat format = convert->fformat; + GstVideoFormat format = convert->fformat; n_planes = GST_VIDEO_FRAME_N_PLANES (src);