summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Dyomin <artem.dyomin@qt.io>2022-11-07 22:33:53 +0100
committerArtem Dyomin <artem.dyomin@qt.io>2022-11-09 13:40:09 +0000
commitf0fa6b486ca20b6d6cb62f37d1f90596df889f76 (patch)
tree0198df11722548a9c239a74431ec8ea44ed3b1df
parente2b0be5f9c690fa7dfaaf62b02f5b1b3b7f80d1f (diff)
Fix ffmpeg compilation and tests on win CI
- fix unused variables - fix screen capture crash - related commit in qt5 fixes ffmpeg build on CI Currently, the build works with msvc and mingw, llvm should be added in the next commits. See build example: https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085 Change-Id: Ibd27c7520a00899c893a842eef55fa4f30eba948 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 0c2576112d98d5fcadbfb2ee9f407bbc9ad72d85)
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
index f0a6c7b91..34483c9d6 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
@@ -31,7 +31,7 @@ public:
: m_tex(tex)
{}
- qint64 textureHandle(int plane) override
+ qint64 textureHandle(int /*plane*/) override
{
return qint64(m_tex.get());
}
@@ -122,7 +122,6 @@ TextureSet *D3D11TextureConverter::getTextures(AVFrame *frame)
if (sharedTex) {
auto tex = copyTextureFromArray(dev, sharedTex.get(), index);
if (tex) {
- QVideoFrameFormat::PixelFormat format = QFFmpegVideoBuffer::toQtPixelFormat(AVPixelFormat(fCtx->sw_format));
return new D3D11TextureSet(std::move(tex));
}
}