aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cbs_av1_syntax_template.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2023-09-02 14:57:41 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2023-09-07 00:39:02 +0200
commit8238bc0b5e3dba271217b1223a901b3f9713dc6e (patch)
tree2809c5b9d9b26042d584c92afeb76b059484c00f /libavcodec/cbs_av1_syntax_template.c
parent0c6e5f321bf5c4054e8b98232692465b342b42b4 (diff)
downloadffmpeg-8238bc0b5e3dba271217b1223a901b3f9713dc6e.tar.gz
avcodec/defs: Add AV_PROFILE_* defines, deprecate FF_PROFILE_* defines
These defines are also used in other contexts than just AVCodecContext ones, e.g. in libavformat. Furthermore, given that these defines are public, the AV-prefix is the right one, so deprecate (and not just move) the FF-macros. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/cbs_av1_syntax_template.c')
-rw-r--r--libavcodec/cbs_av1_syntax_template.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index a747e17784..6f09c4e410 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -82,7 +82,7 @@ static int FUNC(color_config)(CodedBitstreamContext *ctx, RWContext *rw,
flag(high_bitdepth);
- if (seq_profile == FF_PROFILE_AV1_PROFESSIONAL &&
+ if (seq_profile == AV_PROFILE_AV1_PROFESSIONAL &&
current->high_bitdepth) {
flag(twelve_bit);
priv->bit_depth = current->twelve_bit ? 12 : 10;
@@ -90,7 +90,7 @@ static int FUNC(color_config)(CodedBitstreamContext *ctx, RWContext *rw,
priv->bit_depth = current->high_bitdepth ? 10 : 8;
}
- if (seq_profile == FF_PROFILE_AV1_HIGH)
+ if (seq_profile == AV_PROFILE_AV1_HIGH)
infer(mono_chrome, 0);
else
flag(mono_chrome);
@@ -126,10 +126,10 @@ static int FUNC(color_config)(CodedBitstreamContext *ctx, RWContext *rw,
} else {
flag(color_range);
- if (seq_profile == FF_PROFILE_AV1_MAIN) {
+ if (seq_profile == AV_PROFILE_AV1_MAIN) {
infer(subsampling_x, 1);
infer(subsampling_y, 1);
- } else if (seq_profile == FF_PROFILE_AV1_HIGH) {
+ } else if (seq_profile == AV_PROFILE_AV1_HIGH) {
infer(subsampling_x, 0);
infer(subsampling_y, 0);
} else {
@@ -190,8 +190,8 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
HEADER("Sequence Header");
- fc(3, seq_profile, FF_PROFILE_AV1_MAIN,
- FF_PROFILE_AV1_PROFESSIONAL);
+ fc(3, seq_profile, AV_PROFILE_AV1_MAIN,
+ AV_PROFILE_AV1_PROFESSIONAL);
flag(still_picture);
flag(reduced_still_picture_header);