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/libaomdec.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/libaomdec.c')
| -rw-r--r-- | libavcodec/libaomdec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 767c216aa9..695d901051 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -78,17 +78,17 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) if (img->bit_depth == 8) { avctx->pix_fmt = img->monochrome ? AV_PIX_FMT_GRAY8 : AV_PIX_FMT_YUV420P; - avctx->profile = FF_PROFILE_AV1_MAIN; + avctx->profile = AV_PROFILE_AV1_MAIN; return 0; } else if (img->bit_depth == 10) { avctx->pix_fmt = img->monochrome ? AV_PIX_FMT_GRAY10 : AV_PIX_FMT_YUV420P10; - avctx->profile = FF_PROFILE_AV1_MAIN; + avctx->profile = AV_PROFILE_AV1_MAIN; return 0; } else if (img->bit_depth == 12) { avctx->pix_fmt = img->monochrome ? AV_PIX_FMT_GRAY12 : AV_PIX_FMT_YUV420P12; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; + avctx->profile = AV_PROFILE_AV1_PROFESSIONAL; return 0; } else { return AVERROR_INVALIDDATA; @@ -97,15 +97,15 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) case AOM_IMG_FMT_I42216: if (img->bit_depth == 8) { avctx->pix_fmt = AV_PIX_FMT_YUV422P; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; + avctx->profile = AV_PROFILE_AV1_PROFESSIONAL; return 0; } else if (img->bit_depth == 10) { avctx->pix_fmt = AV_PIX_FMT_YUV422P10; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; + avctx->profile = AV_PROFILE_AV1_PROFESSIONAL; return 0; } else if (img->bit_depth == 12) { avctx->pix_fmt = AV_PIX_FMT_YUV422P12; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; + avctx->profile = AV_PROFILE_AV1_PROFESSIONAL; return 0; } else { return AVERROR_INVALIDDATA; @@ -115,18 +115,18 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) if (img->bit_depth == 8) { avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; - avctx->profile = FF_PROFILE_AV1_HIGH; + avctx->profile = AV_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 10) { avctx->pix_fmt = AV_PIX_FMT_YUV444P10; avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; - avctx->profile = FF_PROFILE_AV1_HIGH; + avctx->profile = AV_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 12) { avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; + avctx->profile = AV_PROFILE_AV1_PROFESSIONAL; return 0; } else { return AVERROR_INVALIDDATA; |