summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Moskal <bartlomiej.moskal@qt.io>2024-03-07 22:11:21 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2024-03-08 11:02:04 +0000
commit77b4d7acd385e996eb705d298e5557ec640d2281 (patch)
tree7dc0cb03901e4f39d055c41465939396964134a1
parent8ea8f25ca91352c031441d43fab222188703805b (diff)
Android: Fix compilation because of missing conversionv6.7.0-rc1
Use QStringLiteral instead of QStringView for string data comparison. Fixes: QTBUG-123105 Change-Id: I0b6970d56e8b4a406d1b745c32f0c6d54938c71d Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpeg.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
index fab9e7748..41a8f4d32 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpeg.cpp
@@ -227,12 +227,12 @@ std::optional<std::unordered_set<AVCodecID>> availableHWCodecs(const CodecStorag
std::unordered_set<AVCodecID> availabeCodecs;
auto getCodecId = [] (const QString& codecName) {
- if (codecName == QStringView("3gpp")) return AV_CODEC_ID_H263;
- if (codecName == QStringView("avc")) return AV_CODEC_ID_H264;
- if (codecName == QStringView("hevc")) return AV_CODEC_ID_HEVC;
- if (codecName == QStringView("mp4v-es")) return AV_CODEC_ID_MPEG4;
- if (codecName == QStringView("x-vnd.on2.vp8")) return AV_CODEC_ID_VP8;
- if (codecName == QStringView("x-vnd.on2.vp9")) return AV_CODEC_ID_VP9;
+ if (codecName == QStringLiteral("3gpp")) return AV_CODEC_ID_H263;
+ if (codecName == QStringLiteral("avc")) return AV_CODEC_ID_H264;
+ if (codecName == QStringLiteral("hevc")) return AV_CODEC_ID_HEVC;
+ if (codecName == QStringLiteral("mp4v-es")) return AV_CODEC_ID_MPEG4;
+ if (codecName == QStringLiteral("x-vnd.on2.vp8")) return AV_CODEC_ID_VP8;
+ if (codecName == QStringLiteral("x-vnd.on2.vp9")) return AV_CODEC_ID_VP9;
return AV_CODEC_ID_NONE;
};