diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-09-08 11:53:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-08 11:36:08 +0000 |
| commit | 38b815ff06879ddbb1f0940c35f1ce58c81f936c (patch) | |
| tree | 432fcae1016d66457327950281f4fc45e841149c | |
| parent | 2d4048f23698c9659608fc1e110e00e58f53aaf7 (diff) | |
Fix a couple of compiler warnings
Change-Id: I537035b03034c237639955710b933decbb250a09
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c6340c6b6c7e8af5e2a7fd16d196074c4180550e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/platform/darwin/qdarwinformatsinfo.mm | 2 | ||||
| -rw-r--r-- | tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/platform/darwin/qdarwinformatsinfo.mm b/src/multimedia/platform/darwin/qdarwinformatsinfo.mm index 9ba42c14b..58b973ea9 100644 --- a/src/multimedia/platform/darwin/qdarwinformatsinfo.mm +++ b/src/multimedia/platform/darwin/qdarwinformatsinfo.mm @@ -180,6 +180,7 @@ int QDarwinFormatInfo::audioFormatForCodec(QMediaFormat::AudioCodec codec) case QMediaFormat::AudioCodec::Unspecified: case QMediaFormat::AudioCodec::DolbyTrueHD: case QMediaFormat::AudioCodec::Vorbis: + case QMediaFormat::AudioCodec::WMA: // Unsupported, shouldn't happen. Fall back to AAC case QMediaFormat::AudioCodec::AAC: codecId = kAudioFormatMPEG4AAC; @@ -217,6 +218,7 @@ NSString *QDarwinFormatInfo::videoFormatForCodec(QMediaFormat::VideoCodec codec) case QMediaFormat::VideoCodec::H265: case QMediaFormat::VideoCodec::AV1: case QMediaFormat::VideoCodec::Theora: + case QMediaFormat::VideoCodec::WMV: break; case QMediaFormat::VideoCodec::MPEG1: diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index ceed4eeff..a0b510507 100644 --- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -359,7 +359,6 @@ void tst_QMediaRecorder::testSettingsApplied() QMediaCaptureSession session; QMediaRecorder encoder; session.setRecorder(&encoder); - auto *mock = mockIntegration->lastCaptureService()->mockControl; encoder.setVideoResolution(640,480); |