merge new libde265 wrapper code