codec/avcodec/vaapi-x11.c: CopyPictureToVAImage() cleanup.

Move setting of VAImage properties to the function where the image is
created.

modules/codec/avcodec/vaapi_x11.c

@@ -719,6 +719,19 @@ static int CopyPictureToVAImage(vout_display_t *vd, picture_t *pic,
     }
     assert(image->image_id != VA_INVALID_ID);
 
+    memcpy(image->component_order, "RGBA", 4);
+
+    image->format.alpha_mask = 0x000000FF;
+    image->format.red_mask = pic->format.i_rmask;
+    image->format.blue_mask = pic->format.i_bmask;
+    image->format.green_mask = pic->format.i_gmask;
+
+    image->num_palette_entries = 0;
+    image->entry_bytes = 0;
+
+    if (pic->format.p_palette)
+        CopyPalette(vd, image, pic->format.p_palette);
+
     void *p_base;
     status = vaMapBuffer(sys->conn->p_display, image->buf, &p_base);
     if (status != VA_STATUS_SUCCESS)
@@ -808,17 +821,6 @@ static int RenderDirectSubpicture(vout_display_t *vd, picture_t *picture, subpic
             goto cleanup;
         }
 
-        image->format.alpha_mask = 0xFFFFFF00;
-        image->format.red_mask = region->p_picture->format.i_rmask;
-        image->format.blue_mask = region->p_picture->format.i_bmask;
-        image->format.green_mask = region->p_picture->format.i_gmask;
-
-        image->num_palette_entries = 0;
-        image->entry_bytes = 0;
-
-        if (region->p_picture->format.p_palette)
-            CopyPalette(vd, image, region->p_picture->format.p_palette);
-
         /* Create Subpicture */
         vasub_cache->i_id = SubpictureCreate(vd, subpicture, region,
                                                  image, sys->sflags);