diff --git a/src/gallium/frontends/vdpau/vdpau_private.h b/src/gallium/frontends/vdpau/vdpau_private.h
index 3949b1aefe6..339896caab9 100644
--- a/src/gallium/frontends/vdpau/vdpau_private.h
+++ b/src/gallium/frontends/vdpau/vdpau_private.h
@@ -145,16 +145,19 @@ FormatYCBCRToPipe(VdpYCbCrFormat vdpau_format)
       default:
          /* NOTE: Can't be "unreachable", as it's quite reachable. */
          assert(!"unexpected VdpYCbCrFormat");
+         return PIPE_FORMAT_NONE;
 #ifdef VDP_YCBCR_FORMAT_Y_UV_444
       case VDP_YCBCR_FORMAT_Y_UV_444:
+         return PIPE_FORMAT_NONE;
 #endif
 #ifdef VDP_YCBCR_FORMAT_Y_U_V_444
       case VDP_YCBCR_FORMAT_Y_U_V_444:
+         return PIPE_FORMAT_NONE;
 #endif
 #ifdef VDP_YCBCR_FORMAT_Y_U_V_444_16
       case VDP_YCBCR_FORMAT_Y_U_V_444_16:
-#endif
          return PIPE_FORMAT_NONE;
+#endif
    }
 
 }