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/sbcenc.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/sbcenc.c')
| -rw-r--r-- | libavcodec/sbcenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index 9d6e0b9f54..6e1dd88c72 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -199,7 +199,7 @@ static int sbc_encode_init(AVCodecContext *avctx) SBCEncContext *sbc = avctx->priv_data; struct sbc_frame *frame = &sbc->frame; - if (avctx->profile == FF_PROFILE_SBC_MSBC) + if (avctx->profile == AV_PROFILE_SBC_MSBC) sbc->msbc = 1; if (sbc->msbc) { @@ -333,7 +333,7 @@ static const AVOption options[] = { OFFSET(max_delay), AV_OPT_TYPE_DURATION, {.i64 = 13000}, 1000,13000, AE }, { "msbc", "use mSBC mode (wideband speech mono SBC)", OFFSET(msbc), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AE }, - FF_AVCTX_PROFILE_OPTION("msbc", NULL, AUDIO, FF_PROFILE_SBC_MSBC) + FF_AVCTX_PROFILE_OPTION("msbc", NULL, AUDIO, AV_PROFILE_SBC_MSBC) { NULL }, }; |