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/h264_parse.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/h264_parse.c')
| -rw-r--r-- | libavcodec/h264_parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 97ddf0e437..3378650fd5 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -526,22 +526,22 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, * * @param sps SPS * - * @return profile as defined by FF_PROFILE_H264_* + * @return profile as defined by AV_PROFILE_H264_* */ int ff_h264_get_profile(const SPS *sps) { int profile = sps->profile_idc; switch (sps->profile_idc) { - case FF_PROFILE_H264_BASELINE: + case AV_PROFILE_H264_BASELINE: // constraint_set1_flag set to 1 - profile |= (sps->constraint_set_flags & 1 << 1) ? FF_PROFILE_H264_CONSTRAINED : 0; + profile |= (sps->constraint_set_flags & 1 << 1) ? AV_PROFILE_H264_CONSTRAINED : 0; break; - case FF_PROFILE_H264_HIGH_10: - case FF_PROFILE_H264_HIGH_422: - case FF_PROFILE_H264_HIGH_444_PREDICTIVE: + case AV_PROFILE_H264_HIGH_10: + case AV_PROFILE_H264_HIGH_422: + case AV_PROFILE_H264_HIGH_444_PREDICTIVE: // constraint_set3_flag set to 1 - profile |= (sps->constraint_set_flags & 1 << 3) ? FF_PROFILE_H264_INTRA : 0; + profile |= (sps->constraint_set_flags & 1 << 3) ? AV_PROFILE_H264_INTRA : 0; break; } |