diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-21 13:36:12 +0100 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-22 09:58:30 +0100 |
commit | 8e68840e9ba921b50ae240c2e04831a125811658 (patch) | |
tree | 44360f61bef835ffbde73793ff7ddcf2fde5e96c /src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp | |
parent | 15190f347bac9b2e4a8c855d67e864051eb514d2 (diff) |
Code cleanup: remove old ffmpeg decoder
What's done:
- remove old decoder
- namespace PlaybackEngineInternal seems to be not needed, so
it's removed
- some minor clean up with unique_ptr usage
- logic is not changed
Pick-to: 6.5
Change-Id: I5089c87ef4c424930bca96d5f2935bfd88c20f5f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp')
-rw-r--r-- | src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp index 525cc691a..e9c1eca29 100644 --- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp +++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -namespace QFFmpeg::PlaybackEngineInternal { +namespace QFFmpeg { static void insertMediaData(QMediaMetaData &metaData, QPlatformMediaPlayer::TrackType trackType, const AVStream *stream) @@ -232,6 +232,6 @@ int MediaDataHolder::activeTrack(QPlatformMediaPlayer::TrackType type) const return type < QPlatformMediaPlayer::NTrackTypes ? m_requestedStreams[type] : -1; } -} +} // namespace QFFmpeg QT_END_NAMESPACE |