diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-02 14:57:41 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:39:02 +0200 |
| commit | 8238bc0b5e3dba271217b1223a901b3f9713dc6e (patch) | |
| tree | 2809c5b9d9b26042d584c92afeb76b059484c00f /libavformat/av1.c | |
| parent | 0c6e5f321bf5c4054e8b98232692465b342b42b4 (diff) | |
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 'libavformat/av1.c')
| -rw-r--r-- | libavformat/av1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/av1.c b/libavformat/av1.c index b6eaf50627..4455ec0504 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -23,7 +23,7 @@ #include "libavutil/mem.h" #include "libavcodec/av1.h" #include "libavcodec/av1_parse.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/defs.h" #include "libavcodec/put_bits.h" #include "av1.h" #include "avio.h" @@ -141,12 +141,12 @@ static int parse_color_config(AV1SequenceParameters *seq_params, GetBitContext * { int twelve_bit = 0; int high_bitdepth = get_bits1(gb); - if (seq_params->profile == FF_PROFILE_AV1_PROFESSIONAL && high_bitdepth) + if (seq_params->profile == AV_PROFILE_AV1_PROFESSIONAL && high_bitdepth) twelve_bit = get_bits1(gb); seq_params->bitdepth = 8 + (high_bitdepth * 2) + (twelve_bit * 2); - if (seq_params->profile == FF_PROFILE_AV1_HIGH) + if (seq_params->profile == AV_PROFILE_AV1_HIGH) seq_params->monochrome = 0; else seq_params->monochrome = get_bits1(gb); @@ -176,10 +176,10 @@ static int parse_color_config(AV1SequenceParameters *seq_params, GetBitContext * } else { seq_params->color_range = get_bits1(gb); - if (seq_params->profile == FF_PROFILE_AV1_MAIN) { + if (seq_params->profile == AV_PROFILE_AV1_MAIN) { seq_params->chroma_subsampling_x = 1; seq_params->chroma_subsampling_y = 1; - } else if (seq_params->profile == FF_PROFILE_AV1_HIGH) { + } else if (seq_params->profile == AV_PROFILE_AV1_HIGH) { seq_params->chroma_subsampling_x = 0; seq_params->chroma_subsampling_y = 0; } else { |