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/dxva2.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/dxva2.c')
| -rw-r--r-- | libavcodec/dxva2.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 568d686f39..d7bc587562 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -53,28 +53,28 @@ DEFINE_GUID(ff_IID_IDirectXVideoDecoderService, 0xfc51a551,0xd5e7,0x11d9,0xaf,0x typedef struct dxva_mode { const GUID *guid; enum AVCodecID codec; - // List of supported profiles, terminated by a FF_PROFILE_UNKNOWN entry. + // List of supported profiles, terminated by a AV_PROFILE_UNKNOWN entry. // If NULL, don't check profile. const int *profiles; } dxva_mode; -static const int prof_mpeg2_main[] = {FF_PROFILE_MPEG2_SIMPLE, - FF_PROFILE_MPEG2_MAIN, - FF_PROFILE_UNKNOWN}; -static const int prof_h264_high[] = {FF_PROFILE_H264_CONSTRAINED_BASELINE, - FF_PROFILE_H264_MAIN, - FF_PROFILE_H264_HIGH, - FF_PROFILE_UNKNOWN}; -static const int prof_hevc_main[] = {FF_PROFILE_HEVC_MAIN, - FF_PROFILE_UNKNOWN}; -static const int prof_hevc_main10[] = {FF_PROFILE_HEVC_MAIN_10, - FF_PROFILE_UNKNOWN}; -static const int prof_vp9_profile0[] = {FF_PROFILE_VP9_0, - FF_PROFILE_UNKNOWN}; -static const int prof_vp9_profile2[] = {FF_PROFILE_VP9_2, - FF_PROFILE_UNKNOWN}; -static const int prof_av1_profile0[] = {FF_PROFILE_AV1_MAIN, - FF_PROFILE_UNKNOWN}; +static const int prof_mpeg2_main[] = {AV_PROFILE_MPEG2_SIMPLE, + AV_PROFILE_MPEG2_MAIN, + AV_PROFILE_UNKNOWN}; +static const int prof_h264_high[] = {AV_PROFILE_H264_CONSTRAINED_BASELINE, + AV_PROFILE_H264_MAIN, + AV_PROFILE_H264_HIGH, + AV_PROFILE_UNKNOWN}; +static const int prof_hevc_main[] = {AV_PROFILE_HEVC_MAIN, + AV_PROFILE_UNKNOWN}; +static const int prof_hevc_main10[] = {AV_PROFILE_HEVC_MAIN_10, + AV_PROFILE_UNKNOWN}; +static const int prof_vp9_profile0[] = {AV_PROFILE_VP9_0, + AV_PROFILE_UNKNOWN}; +static const int prof_vp9_profile2[] = {AV_PROFILE_VP9_2, + AV_PROFILE_UNKNOWN}; +static const int prof_av1_profile0[] = {AV_PROFILE_AV1_MAIN, + AV_PROFILE_UNKNOWN}; static const dxva_mode dxva_modes[] = { /* MPEG-2 */ @@ -199,7 +199,7 @@ static int dxva_check_codec_compatibility(AVCodecContext *avctx, const dxva_mode if (mode->profiles && !(avctx->hwaccel_flags & AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH)) { int i, found = 0; - for (i = 0; mode->profiles[i] != FF_PROFILE_UNKNOWN; i++) { + for (i = 0; mode->profiles[i] != AV_PROFILE_UNKNOWN; i++) { if (avctx->profile == mode->profiles[i]) { found = 1; break; |