mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 03:57:50 +08:00
5962fd3c53
* [opencv4] Update t 4.7.0. * update versions. * [rtabmap] Support opencv 4.7. * Update versions. * [ffmpeg] Update to 5.1.2. * [ffmpeg] Use $VERSION * [ffmpeg] Update versions. * [nasm] Update to 2.16.01. * [ffmpeg] Fix linker crash with nasm. * [discordapi] Update to 2023-01-02 version. * Update versions. * [pangolin] Fix issue with ffmpeg 5.1. * Update versions * [ffmpeg] Fix nasm compilation with x86. * Update ffmpeg.json * Update ffmpeg.json * Update portfile.cmake * Update ffmpeg.json * Update baseline.json Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
14 lines
557 B
Diff
14 lines
557 B
Diff
--- a/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h
|
|
+++ b/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h
|
|
@@ -55,10 +55,6 @@ inline std::string FfmpegFmtToString(const AVPixelFormat fmt)
|
|
TEST_PIX_FMT_RETURN(YUVJ420P);
|
|
TEST_PIX_FMT_RETURN(YUVJ422P);
|
|
TEST_PIX_FMT_RETURN(YUVJ444P);
|
|
-#ifdef FF_API_XVMC
|
|
- TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC);
|
|
- TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT);
|
|
-#endif
|
|
TEST_PIX_FMT_RETURN(UYVY422);
|
|
TEST_PIX_FMT_RETURN(UYYVYY411);
|
|
TEST_PIX_FMT_RETURN(BGR8);
|