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/matroskadec.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/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 0d6f153d18..638e07c13d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -51,8 +51,8 @@ #include "libavutil/time_internal.h" #include "libavutil/spherical.h" -#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" +#include "libavcodec/defs.h" #include "libavcodec/flac.h" #include "libavcodec/mpeg4audio.h" #include "libavcodec/packet_internal.h" @@ -3037,21 +3037,21 @@ static int mkv_parse_subtitle_codec(MatroskaTrack *track, AVStream *st, // [0x30..0x37] are component tags utilized for // non-mobile captioning service ("profile A"). if (component_tag >= 0x30 && component_tag <= 0x37) { - par->profile = FF_PROFILE_ARIB_PROFILE_A; + par->profile = AV_PROFILE_ARIB_PROFILE_A; } break; case 0x0012: // component tag 0x87 signifies a mobile/partial reception // (1seg) captioning service ("profile C"). if (component_tag == 0x87) { - par->profile = FF_PROFILE_ARIB_PROFILE_C; + par->profile = AV_PROFILE_ARIB_PROFILE_C; } break; default: break; } - if (par->profile == FF_PROFILE_UNKNOWN) + if (par->profile == AV_PROFILE_UNKNOWN) av_log(matroska->ctx, AV_LOG_WARNING, "Unknown ARIB caption profile utilized: %02x / %04x\n", component_tag, data_component_id); |