From 453ea2cb6c4be5142987e218cee609cca22e48f5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 11 Jan 2016 20:30:36 +0100
Subject: vaapi: replace VA_STR_FOURCC

---
 video/out/opengl/hwdec_vaegl.c | 4 ++--
 video/out/vo_vaapi.c           | 2 +-
 video/vaapi.c                  | 2 +-
 video/vaapi.h                  | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/video/out/opengl/hwdec_vaegl.c b/video/out/opengl/hwdec_vaegl.c
index 1771c74751..8b9dc93c09 100644
--- a/video/out/opengl/hwdec_vaegl.c
+++ b/video/out/opengl/hwdec_vaegl.c
@@ -283,12 +283,12 @@ static int map_image(struct gl_hwdec *hw, struct mp_image *hw_image,
     int mpfmt = va_fourcc_to_imgfmt(va_image->format.fourcc);
     if (mpfmt != IMGFMT_NV12 && mpfmt != IMGFMT_420P) {
         MP_FATAL(p, "unsupported VA image format %s\n",
-                 VA_STR_FOURCC(va_image->format.fourcc));
+                 mp_tag_str(va_image->format.fourcc));
         goto err;
     }
 
     if (!hw->converted_imgfmt) {
-        MP_VERBOSE(p, "format: %s %s\n", VA_STR_FOURCC(va_image->format.fourcc),
+        MP_VERBOSE(p, "format: %s %s\n", mp_tag_str(va_image->format.fourcc),
                    mp_imgfmt_to_name(mpfmt));
         hw->converted_imgfmt = mpfmt;
     }
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index 2bb9d800cd..5275d4d28d 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -615,7 +615,7 @@ static int preinit(struct vo *vo)
 
     for (int i = 0; i < p->va_num_subpic_formats; i++) {
         MP_VERBOSE(vo, "  %s, flags 0x%x\n",
-                   VA_STR_FOURCC(p->va_subpic_formats[i].fourcc),
+                   mp_tag_str(p->va_subpic_formats[i].fourcc),
                    p->va_subpic_flags[i]);
         if (p->va_subpic_formats[i].fourcc == OSD_VA_FORMAT) {
             p->osd_format = p->va_subpic_formats[i];
diff --git a/video/vaapi.c b/video/vaapi.c
index 1b4cdf6000..61d94ef156 100644
--- a/video/vaapi.c
+++ b/video/vaapi.c
@@ -104,7 +104,7 @@ static void va_get_formats(struct mp_vaapi_ctx *ctx)
         return;
     MP_VERBOSE(ctx, "%d image formats available:\n", formats->num);
     for (int i = 0; i < formats->num; i++)
-        MP_VERBOSE(ctx, "  %s\n", VA_STR_FOURCC(formats->entries[i].fourcc));
+        MP_VERBOSE(ctx, "  %s\n", mp_tag_str(formats->entries[i].fourcc));
     ctx->image_formats = formats;
 }
 
diff --git a/video/vaapi.h b/video/vaapi.h
index 888730e514..11ff2c96f9 100644
--- a/video/vaapi.h
+++ b/video/vaapi.h
@@ -23,9 +23,6 @@
 #include <pthread.h>
 #include <va/va.h>
 
-#define VA_STR_FOURCC(fcc) \
-    (const char[]){(fcc), (fcc) >> 8u, (fcc) >> 16u, (fcc) >> 24u, 0}
-
 #include "mp_image.h"
 #include "hwdec.h"
 
-- 
cgit v1.2.3