From: Sebastian Dröge <sebastian@centricular.com>
Date: Tue, 10 Feb 2015 15:38:05 +0000 (+0100)
Subject: video-converter: Use correct enum type to fix compiler warnings with clang
X-Git-Tag: 1.19.3~511^2~3906
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b68067137495c665f519df18b09aa7d01853011c;p=platform%2Fupstream%2Fgstreamer.git

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,
    ~~~~~~~~~~~~~~~~~~~~~~~~~            ^~~~~~
---

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;