2 files changed, 14 insertions, 7 deletions
diff --git a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
index 64e9ac21f..af1a4486f 100644
--- a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
+++ b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
@@ -63,22 +63,28 @@ class QGstCodecsInfo
 public:
     enum ElementType { AudioEncoder, VideoEncoder, Muxer };
 
+    struct CodecInfo {
+        QString description;
+        QByteArray elementName;
+        GstRank rank;
+    };
+
     QGstCodecsInfo(ElementType elementType);
 
     QStringList supportedCodecs() const;
     QString codecDescription(const QString &codec) const;
-
-#if GST_CHECK_VERSION(0,10,31)
-    static GstCaps* supportedElementCaps(GstElementFactoryListType elementType,
-                                         GstRank minimumRank = GST_RANK_MARGINAL,
-                                         GstPadDirection padDirection = GST_PAD_SRC);
-#endif
+    QByteArray codecElement(const QString &codec) const;
+    QStringList codecOptions(const QString &codec) const;
 
 private:
+    void updateCodecs(ElementType elementType);
+    GList *elementFactories(ElementType elementType) const;
+
     QStringList m_codecs;
-    QMap<QString,QString> m_codecDescriptions;
+    QMap<QString, CodecInfo> m_codecInfo;
 };
 
+Q_DECLARE_TYPEINFO(QGstCodecsInfo::CodecInfo, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h
index 68c9ecda1..8b7de3661 100644
--- a/src/multimedia/gsttools_headers/qgstutils_p.h
+++ b/src/multimedia/gsttools_headers/qgstutils_p.h
@@ -146,6 +146,7 @@ namespace QGstUtils {
     QSize structurePixelAspectRatio(const GstStructure *s);
     QPair<qreal, qreal> structureFrameRateRange(const GstStructure *s);
 
+    QString fileExtensionForMimeType(const QString &mimeType);
 }
 
 void qt_gst_object_ref_sink(gpointer object);