diff options
| author | Doris Verria <doris.verria@qt.io> | 2021-05-10 19:53:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-12 07:31:56 +0000 |
| commit | 3e913c0814464bd9b09307d2e3d7c6763a1481b3 (patch) | |
| tree | aa97f2025f802725d35e59c7e0feba50c7b01551 /src/multimedia/qmediaformat.cpp | |
| parent | 53c2c03771e528dd13f2387f10078991d2a0c5cc (diff) | |
Get rid of QMediaFormat::Mode
This is not needed as we can determine the mode from the encoder
settings' codecs
Change-Id: I1850494cad8fef1ce78f056bcbf8e8b6b0e98112
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/qmediaformat.cpp')
| -rw-r--r-- | src/multimedia/qmediaformat.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/multimedia/qmediaformat.cpp b/src/multimedia/qmediaformat.cpp index 9e1bf5591..bcb246be9 100644 --- a/src/multimedia/qmediaformat.cpp +++ b/src/multimedia/qmediaformat.cpp @@ -91,9 +91,8 @@ const char *mimeTypeForFormat[QMediaFormat::LastFileFormat + 2] = */ // these are non inline to make a possible future addition of a d pointer binary compatible -QMediaFormat::QMediaFormat(FileFormat format, Mode mode) - : fmtMode(mode), - fmt(format) +QMediaFormat::QMediaFormat(FileFormat format) + : fmt(format) { Q_UNUSED(d); } @@ -329,8 +328,7 @@ QString QMediaFormat::videoCodecDescription(QMediaFormat::VideoCodec c) bool QMediaFormat::operator==(const QMediaFormat &other) const { Q_ASSERT(!d); - return fmtMode == other.fmtMode && - fmt == other.fmt && + return fmt == other.fmt && audio == other.audio && video == other.video; } |