From 0467991de759e15123477be499d1ebc5224afcae Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 15 Oct 2020 17:29:27 -0300 Subject: [PATCH] avcodec/allcodecs: move av1_cuvid below libaom_av1 Software decoders should always be first. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 30bdf8921d..82dee16973 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -769,11 +769,12 @@ extern AVCodec ff_idf_decoder; * above is available */ extern AVCodec ff_aac_mf_encoder; extern AVCodec ff_ac3_mf_encoder; -extern AVCodec ff_av1_cuvid_decoder; extern AVCodec ff_h263_v4l2m2m_encoder; extern AVCodec ff_libaom_av1_decoder; /* hwaccel hooks only, so prefer external decoders */ extern AVCodec ff_av1_decoder; +extern AVCodec ff_av1_cuvid_decoder; +extern AVCodec ff_av1_qsv_decoder; extern AVCodec ff_libopenh264_encoder; extern AVCodec ff_libopenh264_decoder; extern AVCodec ff_h264_amf_encoder; @@ -824,7 +825,6 @@ extern AVCodec ff_vp9_mediacodec_decoder; extern AVCodec ff_vp9_qsv_decoder; extern AVCodec ff_vp9_vaapi_encoder; extern AVCodec ff_vp9_qsv_encoder; -extern AVCodec ff_av1_qsv_decoder; // The iterate API is not usable with ossfuzz due to the excessive size of binaries created #if CONFIG_OSSFUZZ