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/mpegts.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/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 0b3edda817..8fd1524a8a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -34,6 +34,7 @@ #include "libavutil/dovi_meta.h" #include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" +#include "libavcodec/defs.h" #include "libavcodec/get_bits.h" #include "libavcodec/opus.h" #include "avformat.h" @@ -2147,7 +2148,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type // Component tag limits are documented in TR-B14, fascicle 2, // Vol. 3, Section 2, 4.2.8.1 int actual_component_tag = sti->stream_identifier - 1; - int picked_profile = FF_PROFILE_UNKNOWN; + int picked_profile = AV_PROFILE_UNKNOWN; int data_component_id = get16(pp, desc_end); if (data_component_id < 0) return AVERROR_INVALIDDATA; @@ -2158,21 +2159,21 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type // non-mobile captioning service ("profile A"). if (actual_component_tag >= 0x30 && actual_component_tag <= 0x37) { - picked_profile = FF_PROFILE_ARIB_PROFILE_A; + picked_profile = AV_PROFILE_ARIB_PROFILE_A; } break; case 0x0012: // component tag 0x87 signifies a mobile/partial reception // (1seg) captioning service ("profile C"). if (actual_component_tag == 0x87) { - picked_profile = FF_PROFILE_ARIB_PROFILE_C; + picked_profile = AV_PROFILE_ARIB_PROFILE_C; } break; default: break; } - if (picked_profile == FF_PROFILE_UNKNOWN) + if (picked_profile == AV_PROFILE_UNKNOWN) break; st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; |