Merge commit '23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a'

[ffmpeg] / libavcodec / profiles.c

diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c
index 721587b3a6a005bb16af897f0aaaaa60631658c5..c31399f83e142dc9553cf0039768aa813e68a0cf 100644 (file)
--- a/libavcodec/profiles.c
+++ b/libavcodec/profiles.c
@@ -30,7 +30,6 @@ const AVProfile ff_aac_profiles[] = {
     { FF_PROFILE_AAC_LD,    "LD"       },
     { FF_PROFILE_AAC_ELD,   "ELD"      },
     { FF_PROFILE_AAC_MAIN,  "Main" },
-    { FF_PROFILE_AAC_LOW,   "LC"   },
     { FF_PROFILE_AAC_SSR,   "SSR"  },
     { FF_PROFILE_AAC_LTP,   "LTP"  },
     { FF_PROFILE_UNKNOWN },
@@ -140,6 +139,13 @@ const AVProfile ff_vp9_profiles[] = {
     { FF_PROFILE_UNKNOWN },
 };
 
+const AVProfile ff_av1_profiles[] = {
+    { FF_PROFILE_AV1_MAIN,         "Main" },
+    { FF_PROFILE_AV1_HIGH,         "High" },
+    { FF_PROFILE_AV1_PROFESSIONAL, "Professional" },
+    { FF_PROFILE_UNKNOWN },
+};
+
 const AVProfile ff_sbc_profiles[] = {
     { FF_PROFILE_SBC_MSBC, "mSBC" },
     { FF_PROFILE_UNKNOWN },