On Tue, Mar 08, 2016 at 10:34:12AM +0100, Hendrik Leppkes wrote: > On Tue, Mar 8, 2016 at 10:20 AM, Diego Biurrun <[email protected]> wrote: > >> --- a/libavutil/pixdesc.c > >> +++ b/libavutil/pixdesc.c > >> @@ -1093,6 +1093,7 @@ static const AVPixFmtDescriptor > >> av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { > >> }, > >> .flags = AV_PIX_FMT_FLAG_RGB, > >> }, > >> +#if FF_API_VAAPI > >> [AV_PIX_FMT_VAAPI_MOCO] = { > >> .name = "vaapi_moco", > >> .log2_chroma_w = 1, > >> @@ -1111,6 +1112,14 @@ static const AVPixFmtDescriptor > >> av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { > >> .log2_chroma_h = 1, > >> .flags = AV_PIX_FMT_FLAG_HWACCEL, > >> }, > >> +#else > >> + [AV_PIX_FMT_VAAPI] = { > >> + .name = "vaapi", > >> + .log2_chroma_w = 1, > >> + .log2_chroma_h = 1, > >> + .flags = AV_PIX_FMT_FLAG_HWACCEL, > >> + }, > >> +#endif > >> [AV_PIX_FMT_VDA_VLD] = { > >> .name = "vda_vld", > >> .log2_chroma_w = 1, > >> @@ -1655,6 +1664,11 @@ enum AVPixelFormat av_get_pix_fmt(const char *name) > >> snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le")); > >> pix_fmt = get_pix_fmt_internal(name2); > >> } > >> + > >> +#if FF_API_VAAPI > >> + if (pix_fmt == AV_PIX_FMT_NONE && !strcmp(name, "vaapi")) > >> + pix_fmt = AV_PIX_FMT_VAAPI; > >> +#endif > >> return pix_fmt; > >> } > > > > Shouldn't you drop AV_PIX_FMT_VDA_VLD as well? > > How is VDA related to his VAAPI patchset?
By a brainfart: I misread AV_PIX_FMT_VDA_VLD as AV_PIX_FMT_VAAPI_VLD. I wonder how I managed to do that... Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
