diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-20 17:54:18 +0100 |
|---|---|---|
| committer | Andrew den Exter <andrew.den.exter@qinetic.com.au> | 2014-11-27 23:30:05 +0100 |
| commit | 108dda7a90bd0f0337358b0db47ae55acd16dea6 (patch) | |
| tree | e74c44c004b257fb99fdc96063641c76ac0426cf /src/gsttools/qgstcodecsinfo.cpp | |
| parent | 7e3d69668e3f04110a651dee1850a1d0c885947b (diff) | |
GStreamer: port to 1.0.
0.10 is still used by default.
To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake
for qtmultimedia.pro.
Contributions from:
Andrew den Exter <andrew.den.exter@qinetic.com.au>
Ilya Smelykh <ilya@videoexpertsgroup.com>
Jim Hodapp <jim.hodapp@canonical.com>
Sergio Schvezov <sergio.schvezov@canonical.com>
Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/gsttools/qgstcodecsinfo.cpp')
| -rw-r--r-- | src/gsttools/qgstcodecsinfo.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gsttools/qgstcodecsinfo.cpp b/src/gsttools/qgstcodecsinfo.cpp index f584fbe69..888722aee 100644 --- a/src/gsttools/qgstcodecsinfo.cpp +++ b/src/gsttools/qgstcodecsinfo.cpp @@ -32,7 +32,7 @@ ****************************************************************************/ #include "qgstcodecsinfo_p.h" - +#include "qgstutils_p.h" #include <QtCore/qset.h> #ifdef QMEDIA_GSTREAMER_CAMERABIN @@ -146,7 +146,7 @@ GstCaps* QGstCodecsInfo::supportedElementCaps(GstElementFactoryListType elementT if (fakeEncoderMimeTypes.contains(gst_structure_get_name(structure))) continue; - GstStructure *newStructure = gst_structure_new(gst_structure_get_name(structure), NULL); + GstStructure *newStructure = qt_gst_structure_new_empty(gst_structure_get_name(structure)); //add structure fields to distinguish between formats with similar mime types, //like audio/mpeg @@ -166,7 +166,11 @@ GstCaps* QGstCodecsInfo::supportedElementCaps(GstElementFactoryListType elementT } } +#if GST_CHECK_VERSION(1,0,0) + res = +#endif gst_caps_merge_structure(res, newStructure); + } gst_caps_unref(caps); } |