On 08/03/16 09:20, Diego Biurrun wrote:
> On Mon, Mar 07, 2016 at 11:21:00PM +0000, Mark Thompson wrote:
>> ---
>> libavcodec/h263dec.c | 2 +-
>> libavcodec/h264_slice.c | 2 +-
>> libavcodec/mpeg12dec.c | 2 +-
>> libavcodec/vaapi_h264.c | 2 +-
>> libavcodec/vaapi_mpeg2.c | 2 +-
>> libavcodec/vaapi_mpeg4.c | 4 ++--
>> libavcodec/vaapi_vc1.c | 4 ++--
>> libavcodec/vc1dec.c | 2 +-
>> libavutil/pixdesc.c | 14 ++++++++++++++
>> libavutil/pixfmt.h | 5 +++++
>> libavutil/version.h | 3 +++
>> 11 files changed, 32 insertions(+), 10 deletions(-)
>
> You should update doc/APIchanges.
Something like:
2016-03-xx - xxxxxxx - lavu 55.y.z - pixfmt.h
Deprecate all AV_PIX_FMT_VAAPI_* formats.
Replaced by AV_PIX_FMT_VAAPI.
?
>> --- 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?
>
> Diego
No? I know nothing about VDA beyond it being some sort of Apple thing - even if
it's misnamed, it should probably be a separate patch.
Thanks,
- Mark
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
