diff options
| author | Martin Storsjö <martin@martin.st> | 2020-05-25 13:26:04 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-05-27 00:19:32 +0300 |
| commit | 6c33a230e46a1434e32acf0004c6ffb983c2b566 (patch) | |
| tree | 125d19016d183835252e969123e8d0fb2de921e4 /libavcodec/mfenc.c | |
| parent | 869f655e2e92c739a4d7b1fb2f4d331a412f3024 (diff) | |
| download | ffmpeg-6c33a230e46a1434e32acf0004c6ffb983c2b566.tar.gz | |
mfenc: Avoid including codecapi.h, fix building in UWP mode with clang
Including codecapi.h and uuids.h in UWP mode doesn't define all defines
properly, ending up with constructs that MSVC silently tolerates, but
that clang errors out on, like this:
DEFINE_GUIDEX(CODECAPI_AVEncCommonFormatConstraint);
Just avoid including codecapi.h completely and hardcode the last few
enum values we use from there. We already use local versions of most
enums from there, due to older mingw-w64 headers being incomplete.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mfenc.c')
| -rw-r--r-- | libavcodec/mfenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 3432d48f30..ee3c164e69 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -651,13 +651,13 @@ static int mf_encv_output_adjust(AVCodecContext *avctx, IMFMediaType *type) // (MS HEVC supports eAVEncH265VProfile_Main_420_8 only.) if (avctx->codec_id == AV_CODEC_ID_H264) { - UINT32 profile = eAVEncH264VProfile_Base; + UINT32 profile = ff_eAVEncH264VProfile_Base; switch (avctx->profile) { case FF_PROFILE_H264_MAIN: - profile = eAVEncH264VProfile_Main; + profile = ff_eAVEncH264VProfile_Main; break; case FF_PROFILE_H264_HIGH: - profile = eAVEncH264VProfile_High; + profile = ff_eAVEncH264VProfile_High; break; } IMFAttributes_SetUINT32(type, &MF_MT_MPEG2_PROFILE, profile); |