Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

[ffmpeg] / libavutil / pixdesc.c

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 648d014daa22f3e0b933d1a23d025c193a397e13..41bbe5d2364ec34d12521f26bd3ff463072a2ca1 100644 (file)
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1900,6 +1900,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         .name = "vda",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
     },
+    [AV_PIX_FMT_QSV] = {
+        .name = "qsv",
+        .flags = AV_PIX_FMT_FLAG_HWACCEL,
+    },
 };
 
 static const char *color_range_names[AVCOL_RANGE_NB] = {
@@ -2049,7 +2053,6 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc)
 
     return desc - av_pix_fmt_descriptors;
 }
-FF_ENABLE_DEPRECATION_WARNINGS
 
 int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
                                      int *h_shift, int *v_shift)
@@ -2118,6 +2121,7 @@ void ff_check_pixfmt_descriptors(void){
         }
     }
 }
+FF_ENABLE_DEPRECATION_WARNINGS
 
 
 enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt)