diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
| commit | 87d4252f36ee85615c72d8ba21008ba4018b841d (patch) | |
| tree | f657f421ef7ac567f0b5dc60fdcd7f7534f73413 /src/multimedia/controls/qvideoencodersettingscontrol.h | |
| parent | 3064d50f0e58599dbb9818a1c558b4ad77e47350 (diff) | |
| parent | 0bc28be67c2854a4c06cddd536e43ac87c225670 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7f644741677dbd848d480dde7c76cdf7ad81e4b9
Diffstat (limited to 'src/multimedia/controls/qvideoencodersettingscontrol.h')
| -rw-r--r-- | src/multimedia/controls/qvideoencodersettingscontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 366d585ee..8c8213cf5 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -71,7 +71,7 @@ public: bool *continuous = nullptr) const = 0; virtual QStringList supportedVideoCodecs() const = 0; - virtual QString videoCodecDescription(const QString &codecName) const = 0; + virtual QString videoCodecDescription(const QString &codec) const = 0; virtual QVideoEncoderSettings videoSettings() const = 0; virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; |