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/amfenc_h264.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 'libavcodec/amfenc_h264.c')
| -rw-r--r-- | libavcodec/amfenc_h264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 2380aa4e90..bd544d12df 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -223,19 +223,19 @@ FF_ENABLE_DEPRECATION_WARNINGS AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_FRAMERATE, framerate); switch (avctx->profile) { - case FF_PROFILE_H264_BASELINE: + case AV_PROFILE_H264_BASELINE: profile = AMF_VIDEO_ENCODER_PROFILE_BASELINE; break; - case FF_PROFILE_H264_MAIN: + case AV_PROFILE_H264_MAIN: profile = AMF_VIDEO_ENCODER_PROFILE_MAIN; break; - case FF_PROFILE_H264_HIGH: + case AV_PROFILE_H264_HIGH: profile = AMF_VIDEO_ENCODER_PROFILE_HIGH; break; - case FF_PROFILE_H264_CONSTRAINED_BASELINE: + case AV_PROFILE_H264_CONSTRAINED_BASELINE: profile = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_BASELINE; break; - case (FF_PROFILE_H264_HIGH | FF_PROFILE_H264_CONSTRAINED): + case (AV_PROFILE_H264_HIGH | AV_PROFILE_H264_CONSTRAINED): profile = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH; break; } @@ -246,7 +246,7 @@ FF_ENABLE_DEPRECATION_WARNINGS AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_PROFILE, profile); profile_level = avctx->level; - if (profile_level == FF_LEVEL_UNKNOWN) { + if (profile_level == AV_LEVEL_UNKNOWN) { profile_level = ctx->level; } if (profile_level != 0) { |