Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/plugins/directshow/player/directshowplayerservice.cpp

Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86

1 files changed, 4 insertions, 0 deletions

diff --git a/src/gsttools/qgstcodecsinfo_p.h b/src/gsttools/qgstcodecsinfo_p.h
index 33ab3de4b..d7aadef21 100644
--- a/src/gsttools/qgstcodecsinfo_p.h
+++ b/src/gsttools/qgstcodecsinfo_p.h
@@ -54,6 +54,7 @@
 #include <private/qgsttools_global_p.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qstringlist.h>
+#include <QSet>
 
 #include <gst/gst.h>
 
@@ -76,6 +77,8 @@ public:
     QString codecDescription(const QString &codec) const;
     QByteArray codecElement(const QString &codec) const;
     QStringList codecOptions(const QString &codec) const;
+    QSet<QString> supportedStreamTypes(const QString &codec) const;
+    QStringList supportedCodecs(const QSet<QString> &types) const;
 
 private:
     void updateCodecs(ElementType elementType);
@@ -83,6 +86,7 @@ private:
 
     QStringList m_codecs;
     QMap<QString, CodecInfo> m_codecInfo;
+    QMap<QString, QSet<QString>> m_streamTypes;
 };
 
 Q_DECLARE_TYPEINFO(QGstCodecsInfo::CodecInfo, Q_MOVABLE_TYPE);