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/camerabin/camerabinvideoencoder.h | |
| 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/camerabin/camerabinvideoencoder.h')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinvideoencoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h index 9617731a5..554e443f0 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h @@ -42,7 +42,7 @@ #ifndef CAMERABINVIDEOENCODE_H #define CAMERABINVIDEOENCODE_H -#include <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> class CameraBinSession; #include <QtCore/qstringlist.h> @@ -56,7 +56,7 @@ class CameraBinSession; QT_USE_NAMESPACE -class CameraBinVideoEncoder : public QVideoEncoderControl +class CameraBinVideoEncoder : public QVideoEncoderSettingsControl { Q_OBJECT public: |