]> git.sesse.net Git - ffmpeg/commit
mfenc: Avoid including codecapi.h, fix building in UWP mode with clang
authorMartin Storsjö <martin@martin.st>
Mon, 25 May 2020 10:26:04 +0000 (13:26 +0300)
committerMartin Storsjö <martin@martin.st>
Tue, 26 May 2020 21:19:32 +0000 (00:19 +0300)
commit6c33a230e46a1434e32acf0004c6ffb983c2b566
tree125d19016d183835252e969123e8d0fb2de921e4
parent869f655e2e92c739a4d7b1fb2f4d331a412f3024
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>
libavcodec/mf_utils.h
libavcodec/mfenc.c