fix compile issue after rebase
authorWind Yuan <feng.yuan@intel.com>
Wed, 18 Jan 2012 11:02:43 +0000 (19:02 +0800)
committerZhong Cong <congx.zhong@intel.com>
Tue, 5 Feb 2013 07:37:11 +0000 (15:37 +0800)
gst/vaapi/gstvaapiupload.c
gst/vaapi/gstvaapiupload.h

index 550d033..9e90d48 100644 (file)
@@ -432,7 +432,7 @@ gst_vaapiupload_transform(
     if (!upload->need_manual_upload) {
         gst_vaapi_image_update_from_buffer(image, inbuf, NULL);
     } else { /* manually copy data to image*/
-        success = gst_vaapi_upload_buffer_to_image(image, inbuf);
+        success = gst_vaapi_convert_buffer_to_image(image, inbuf);
         if (!success)
             goto error_put_image;
     }
@@ -457,7 +457,7 @@ error_put_image:
 }
 
 static GstCaps *
-gst_vaapi_get_other_support_caps(GstVaapiConvert *upload)
+gst_vaapi_get_other_support_caps(GstVaapiUpload *upload)
 {
   GstCaps *caps;
   caps = gst_caps_from_string(GST_VIDEO_CAPS_YUV("YUY2"));
index c5e37c4..c9627d2 100644 (file)
@@ -77,7 +77,7 @@ struct _GstVaapiUpload {
     guint               direct_rendering;
     unsigned int        images_reset    : 1;
     unsigned int        surfaces_reset  : 1;
-    unsigned int        need_manual_convert : 1;
+    unsigned int        need_manual_upload : 1;
 };
 
 struct _GstVaapiUploadClass {