From b68067137495c665f519df18b09aa7d01853011c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 10 Feb 2015 16:38:05 +0100 Subject: [PATCH] video-converter: Use correct enum type to fix compiler warnings with clang video-converter.c:3406:12: error: implicit conversion from enumeration type 'GstVideoFormat' to different enumeration type 'GstFormat' [-Werror,-Wenum-conversion] format = convert->fformat[plane]; ~ ^~~~~~~~~~~~~~~~~~~~~~~ video-converter.c:3413:44: 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:3471:12: error: implicit conversion from enumeration type 'GstVideoFormat' to different enumeration type 'GstFormat' [-Werror,-Wenum-conversion] format = convert->fformat[plane]; ~ ^~~~~~~~~~~~~~~~~~~~~~~ video-converter.c:3487:42: error: implicit conversion from enumeration type 'GstFormat' to different enumeration type 'GstVideoFormat' [-Werror,-Wenum-conversion] gst_video_scaler_vertical (v_scaler, format, lines, d + out_x, i, ~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~ video-converter.c:3551:12: error: implicit conversion from enumeration type 'GstVideoFormat' to different enumeration type 'GstFormat' [-Werror,-Wenum-conversion] format = convert->fformat[plane]; ~ ^~~~~~~~~~~~~~~~~~~~~~~ video-converter.c:3569:46: 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:3577:42: error: implicit conversion from enumeration type 'GstFormat' to different enumeration type 'GstVideoFormat' [-Werror,-Wenum-conversion] gst_video_scaler_vertical (v_scaler, format, lines, d + out_x, i, ~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~ --- gst-libs/gst/video/video-converter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index d2fd738..5ec6af6 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -3392,7 +3392,7 @@ convert_plane_h (GstVideoConverter * convert, { gint i; gint in_x, in_y, out_x, out_y, out_width, out_height; - GstFormat format; + GstVideoFormat format; GstVideoScaler *h_scaler; guint8 *s, *d; gint splane = convert->fsplane[plane]; @@ -3457,7 +3457,7 @@ convert_plane_v (GstVideoConverter * convert, { gint i; gint in_x, in_y, out_x, out_y, out_width, out_height; - GstFormat format; + GstVideoFormat format; GstVideoScaler *v_scaler; gpointer *lines; gint splane = convert->fsplane[plane]; @@ -3536,7 +3536,7 @@ convert_plane_hv (GstVideoConverter * convert, { gint i, tmp_in; gint in_x, in_y, out_x, out_y, out_width, out_height; - GstFormat format; + GstVideoFormat format; GstVideoScaler *h_scaler, *v_scaler; ConverterAlloc *alloc; gpointer *lines; -- 2.7.4