diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
index 147ab7de8d..4aa6488c5d 100644
--- a/gst-libs/gst/gl/gstgldisplay.c
+++ b/gst-libs/gst/gl/gstgldisplay.c
@@ -2425,8 +2425,17 @@ gst_gl_display_thread_do_upload_fill (GstGLDisplay *display)
     //So we have to set a display->hardware (ATI o/ NVIDIA) and
     //etc...
     case GST_VIDEO_FORMAT_YV12:
-      offsetU = 2;
-      offsetV = 1;
+
+      if (g_ascii_strncasecmp ("ATI", (gchar *) glGetString (GL_VENDOR), 3) == 0)
+      {
+        offsetU = 2;
+        offsetV = 1;
+      }
+      else
+      {
+        offsetU = 1;
+        offsetV = 2;
+      }
       break;
     default:
       g_assert_not_reached ();