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 /libavformat/matroskaenc.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 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index bf2ca7106b..ba54f5f98e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -59,9 +59,9 @@ #include "libavutil/stereo3d.h" #include "libavcodec/av1.h" -#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "libavcodec/codec_desc.h" +#include "libavcodec/defs.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" @@ -1154,11 +1154,11 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn case AV_CODEC_ID_ARIB_CAPTION: { unsigned stream_identifier, data_component_id; switch (par->profile) { - case FF_PROFILE_ARIB_PROFILE_A: + case AV_PROFILE_ARIB_PROFILE_A: stream_identifier = 0x30; data_component_id = 0x0008; break; - case FF_PROFILE_ARIB_PROFILE_C: + case AV_PROFILE_ARIB_PROFILE_C: stream_identifier = 0x87; data_component_id = 0x0012; break; |