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 /libavcodec/libaomenc.c | |
| parent | 0c6e5f321bf5c4054e8b98232692465b342b42b4 (diff) | |
| download | ffmpeg-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/libaomenc.c')
| -rw-r--r-- | libavcodec/libaomenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 53a1159b75..aa800834fe 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -451,16 +451,16 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, enccfg->monochrome = 1; /* Fall-through */ case AV_PIX_FMT_YUV420P: - enccfg->g_profile = FF_PROFILE_AV1_MAIN; + enccfg->g_profile = AV_PROFILE_AV1_MAIN; *img_fmt = AOM_IMG_FMT_I420; return 0; case AV_PIX_FMT_YUV422P: - enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL; + enccfg->g_profile = AV_PROFILE_AV1_PROFESSIONAL; *img_fmt = AOM_IMG_FMT_I422; return 0; case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_GBRP: - enccfg->g_profile = FF_PROFILE_AV1_HIGH; + enccfg->g_profile = AV_PROFILE_AV1_HIGH; *img_fmt = AOM_IMG_FMT_I444; return 0; case AV_PIX_FMT_GRAY10: @@ -471,7 +471,7 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, case AV_PIX_FMT_YUV420P12: if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) { enccfg->g_profile = - enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_MAIN : FF_PROFILE_AV1_PROFESSIONAL; + enccfg->g_bit_depth == 10 ? AV_PROFILE_AV1_MAIN : AV_PROFILE_AV1_PROFESSIONAL; *img_fmt = AOM_IMG_FMT_I42016; *flags |= AOM_CODEC_USE_HIGHBITDEPTH; return 0; @@ -480,7 +480,7 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, case AV_PIX_FMT_YUV422P10: case AV_PIX_FMT_YUV422P12: if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) { - enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL; + enccfg->g_profile = AV_PROFILE_AV1_PROFESSIONAL; *img_fmt = AOM_IMG_FMT_I42216; *flags |= AOM_CODEC_USE_HIGHBITDEPTH; return 0; @@ -492,7 +492,7 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, case AV_PIX_FMT_GBRP12: if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) { enccfg->g_profile = - enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_HIGH : FF_PROFILE_AV1_PROFESSIONAL; + enccfg->g_bit_depth == 10 ? AV_PROFILE_AV1_HIGH : AV_PROFILE_AV1_PROFESSIONAL; *img_fmt = AOM_IMG_FMT_I44416; *flags |= AOM_CODEC_USE_HIGHBITDEPTH; return 0; @@ -842,7 +842,7 @@ static av_cold int aom_init(AVCodecContext *avctx, /* 0-3: For non-zero values the encoder increasingly optimizes for reduced * complexity playback on low powered devices at the expense of encode * quality. */ - if (avctx->profile != FF_PROFILE_UNKNOWN) + if (avctx->profile != AV_PROFILE_UNKNOWN) enccfg.g_profile = avctx->profile; enccfg.g_error_resilient = ctx->error_resilient; |