From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Wed, 6 Jun 2012 11:00:58 +0000 (+0200)
Subject: fix Y800 format
X-Git-Tag: 1.19.3~509^2~6982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37df608fdc11e63d57a2e42ca224620a83df8aff;p=platform%2Fupstream%2Fgstreamer.git

fix Y800 format
---

diff --git a/gst/videocrop/gstaspectratiocrop.c b/gst/videocrop/gstaspectratiocrop.c
index ec7bc3d..e1e99cf 100644
--- a/gst/videocrop/gstaspectratiocrop.c
+++ b/gst/videocrop/gstaspectratiocrop.c
@@ -58,7 +58,7 @@ enum
 #define ASPECT_RATIO_CROP_CAPS                        \
   GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, "    \
       "RGBA, ARGB, BGRA, ABGR, RGB, BGR, AYUV, YUY2, " \
-      "YVYU, UYVY, Y800, I420, RGB16, RGB15, GRAY8 }")
+      "YVYU, UYVY, I420, RGB16, RGB15, GRAY8 }")
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index f662bfe..77e6d08 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -80,7 +80,7 @@ enum
 #define VIDEO_CROP_CAPS                                \
   GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, "    \
       "RGBA, ARGB, BGRA, ABGR, RGB, BGR, AYUV, YUY2, " \
-      "YVYU, UYVY, Y800, I420, RGB16, RGB15, GRAY8 }")
+      "YVYU, UYVY, I420, RGB16, RGB15, GRAY8 }")
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
diff --git a/tests/check/elements/aspectratiocrop.c b/tests/check/elements/aspectratiocrop.c
index eb0fb0e..f02c6f9 100644
--- a/tests/check/elements/aspectratiocrop.c
+++ b/tests/check/elements/aspectratiocrop.c
@@ -28,7 +28,7 @@
 #define ASPECT_RATIO_CROP_CAPS                      \
   GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, " \
       "RGBA, ARGB, BGRA, ABGR, RGB, BGR, AYUV, "    \
-      "YUY2, YVYU, UYVY, Y800, I420, YV12, RGB16, " \
+      "YUY2, YVYU, UYVY, GRAY8, I420, YV12, RGB16, " \
       "RGB15 }")
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/tests/check/elements/videocrop.c b/tests/check/elements/videocrop.c
index 2849d8c..b923150 100644
--- a/tests/check/elements/videocrop.c
+++ b/tests/check/elements/videocrop.c
@@ -271,10 +271,7 @@ check_1x1_buffer (GstBuffer * buf, GstCaps * caps)
 
   finfo = info.finfo;
 
-
-  if (GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_Y800)
-    values = gray_values;
-  else if (GST_VIDEO_INFO_IS_YUV (&info))
+  if (GST_VIDEO_INFO_IS_YUV (&info))
     values = yuv_values;
   else if (GST_VIDEO_INFO_IS_GRAY (&info))
     values = gray_values;