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/libx264.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/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index fb3186ca8d..77a9f173b4 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1048,22 +1048,22 @@ static av_cold int X264_init(AVCodecContext *avctx) /* Allow specifying the x264 profile through AVCodecContext. */ if (!x4->profile) switch (avctx->profile) { - case FF_PROFILE_H264_BASELINE: + case AV_PROFILE_H264_BASELINE: x4->profile = "baseline"; break; - case FF_PROFILE_H264_HIGH: + case AV_PROFILE_H264_HIGH: x4->profile = "high"; break; - case FF_PROFILE_H264_HIGH_10: + case AV_PROFILE_H264_HIGH_10: x4->profile = "high10"; break; - case FF_PROFILE_H264_HIGH_422: + case AV_PROFILE_H264_HIGH_422: x4->profile = "high422"; break; - case FF_PROFILE_H264_HIGH_444: + case AV_PROFILE_H264_HIGH_444: x4->profile = "high444"; break; - case FF_PROFILE_H264_MAIN: + case AV_PROFILE_H264_MAIN: x4->profile = "main"; break; default: |