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/dnxhddata.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/dnxhddata.c')
| -rw-r--r-- | libavcodec/dnxhddata.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index d52abe87dd..ce06d77f18 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -22,7 +22,7 @@ #include <stddef.h> #include "libavutil/log.h" #include "libavutil/macros.h" -#include "avcodec.h" +#include "defs.h" #include "dnxhddata.h" /* The quantization tables below are in zigzag order! */ @@ -1110,15 +1110,15 @@ int ff_dnxhd_get_hr_frame_size(int cid, int w, int h) static int dnxhd_find_hr_cid(AVCodecContext *avctx) { switch (avctx->profile) { - case FF_PROFILE_DNXHR_444: + case AV_PROFILE_DNXHR_444: return 1270; - case FF_PROFILE_DNXHR_HQX: + case AV_PROFILE_DNXHR_HQX: return 1271; - case FF_PROFILE_DNXHR_HQ: + case AV_PROFILE_DNXHR_HQ: return 1272; - case FF_PROFILE_DNXHR_SQ: + case AV_PROFILE_DNXHR_SQ: return 1273; - case FF_PROFILE_DNXHR_LB: + case AV_PROFILE_DNXHR_LB: return 1274; } return 0; @@ -1129,7 +1129,7 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth) int i, j; int mbs = avctx->bit_rate / 1000000; - if (avctx->profile != FF_PROFILE_DNXHD) + if (avctx->profile != AV_PROFILE_DNXHD) return dnxhd_find_hr_cid(avctx); if (!mbs) |