virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-20 06:16:02 +02:00
Code Issues Releases Activity

avcodec/defs: Add AV_PROFILE_* defines, deprecate FF_PROFILE_* defines

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt
2023-09-02 14:57:41 +02:00
parent 0c6e5f321b
commit 8238bc0b5e
93 changed files with 879 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/hlsenc.c
View File

@ -39,7 +39,7 @@
#include "libavutil/time.h"
#include "libavutil/time_internal.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/defs.h"
#include "avformat.h"
#include "avio_internal.h"
@ -369,12 +369,12 @@ static void write_codec_attr(AVStream *st, VariantStream *vs)
}
} else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
uint8_t *data = st->codecpar->extradata;
int profile = FF_PROFILE_UNKNOWN;
int level = FF_LEVEL_UNKNOWN;
int profile = AV_PROFILE_UNKNOWN;
int level = AV_LEVEL_UNKNOWN;
if (st->codecpar->profile != FF_PROFILE_UNKNOWN)
if (st->codecpar->profile != AV_PROFILE_UNKNOWN)
profile = st->codecpar->profile;
if (st->codecpar->level != FF_LEVEL_UNKNOWN)
if (st->codecpar->level != AV_LEVEL_UNKNOWN)
level = st->codecpar->level;
/* check the boundary of data which from current position is small than extradata_size */
@ -407,8 +407,8 @@ static void write_codec_attr(AVStream *st, VariantStream *vs)
data++;
}
if (st->codecpar->codec_tag == MKTAG('h','v','c','1') &&
profile != FF_PROFILE_UNKNOWN &&
level != FF_LEVEL_UNKNOWN) {
profile != AV_PROFILE_UNKNOWN &&
level != AV_LEVEL_UNKNOWN) {
snprintf(attr, sizeof(attr), "%s.%d.4.L%d.B01", av_fourcc2str(st->codecpar->codec_tag), profile, level);
} else
goto fail;