mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-08 06:09:50 +00:00
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>
This commit is contained in:
parent
0c6e5f321b
commit
8238bc0b5e
93 changed files with 879 additions and 727 deletions
|
|
@ -390,7 +390,7 @@ static const struct {
|
|||
VAProfile va_profile;
|
||||
VAProfile (*profile_parser)(AVCodecContext *avctx);
|
||||
} vaapi_profile_map[] = {
|
||||
#define MAP(c, p, v, ...) { AV_CODEC_ID_ ## c, FF_PROFILE_ ## p, VAProfile ## v, __VA_ARGS__ }
|
||||
#define MAP(c, p, v, ...) { AV_CODEC_ID_ ## c, AV_PROFILE_ ## p, VAProfile ## v, __VA_ARGS__ }
|
||||
MAP(MPEG2VIDEO, MPEG2_SIMPLE, MPEG2Simple ),
|
||||
MAP(MPEG2VIDEO, MPEG2_MAIN, MPEG2Main ),
|
||||
MAP(H263, UNKNOWN, H263Baseline),
|
||||
|
|
@ -497,7 +497,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx,
|
|||
if (avctx->codec_id != vaapi_profile_map[i].codec_id)
|
||||
continue;
|
||||
if (avctx->profile == vaapi_profile_map[i].codec_profile ||
|
||||
vaapi_profile_map[i].codec_profile == FF_PROFILE_UNKNOWN)
|
||||
vaapi_profile_map[i].codec_profile == AV_PROFILE_UNKNOWN)
|
||||
profile_match = 1;
|
||||
|
||||
va_profile = vaapi_profile_map[i].profile_parser ?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue