diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-20 16:04:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:29 +0200 |
| commit | bba28afe559837321a2083b3ce046ab774a7ef6b (patch) | |
| tree | 8908febff01fa8cfbe889dcde87e425b00fbf0d8 /src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp | |
| parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) | |
Rename a few controls.
The encoder controls could be confused with actual encoding, so make
clear they are just settings. Also, the end point selector controls
were not named very well.
Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp')
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp index 67cfd38d8..2d7c75c2b 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp @@ -48,7 +48,7 @@ #include <math.h> QGstreamerVideoEncode::QGstreamerVideoEncode(QGstreamerCaptureSession *session) - :QVideoEncoderControl(session), m_session(session) + :QVideoEncoderSettingsControl(session), m_session(session) { QList<QByteArray> codecCandidates; codecCandidates << "video/h264" << "video/xvid" << "video/mpeg4" << "video/mpeg1" << "video/mpeg2" << "video/theora"; |