VAAPI: Squash some warnings

MythTV · Feb 15, 2019 · 99fb717 · 99fb717
1 parent 3800685
commit 99fb717
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mythtv/libs/libmythtv/mythopenglinterop.cpp b/mythtv/libs/libmythtv/mythopenglinterop.cpp
@@ -24,6 +24,8 @@ QStringList MythOpenGLInterop::GetAllowedRenderers(MythCodecID CodecId)
 #ifdef USING_GLVAAPI
     if (codec_is_vaapi(CodecId) && (GetInteropType(CodecId) != Unsupported))
         result << "openglvaapi";
+#else
+    (void)CodecId;
 #endif
     return result;
 }

diff --git a/mythtv/libs/libmythtv/vaapicontext.cpp b/mythtv/libs/libmythtv/vaapicontext.cpp
@@ -339,9 +339,9 @@ void VAAPIContext::InitialiseContext(AVCodecContext *Context)
         LOG(VB_GENERAL, LOG_INFO, LOC + QString("Forcing surface format for %1 and %2 with driver '%3'")
             .arg(toString(vaapiid)).arg(MythOpenGLInterop::TypeToString(type)).arg(vendor));
         VASurfaceAttrib prefs[3] = {
-            { VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_SETTABLE, VAGenericValueTypeInteger, format },
-            { VASurfaceAttribUsageHint,   VA_SURFACE_ATTRIB_SETTABLE, VAGenericValueTypeInteger, VA_SURFACE_ATTRIB_USAGE_HINT_DISPLAY },
-            { VASurfaceAttribMemoryType,  VA_SURFACE_ATTRIB_SETTABLE, VAGenericValueTypeInteger, VA_SURFACE_ATTRIB_MEM_TYPE_VA} };
+            { VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_SETTABLE, { VAGenericValueTypeInteger, { format } } },
+            { VASurfaceAttribUsageHint,   VA_SURFACE_ATTRIB_SETTABLE, { VAGenericValueTypeInteger, { VA_SURFACE_ATTRIB_USAGE_HINT_DISPLAY } } },
+            { VASurfaceAttribMemoryType,  VA_SURFACE_ATTRIB_SETTABLE, { VAGenericValueTypeInteger, { VA_SURFACE_ATTRIB_MEM_TYPE_VA} } } };
         vaapi_frames_ctx->attributes = prefs;
         vaapi_frames_ctx->nb_attributes = 3;
     }