Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Iaa608643f6626ed074a9fd374555cc5bc84659d5
2014-11-27 14:44:33 +01:00
parent eddc8e1e58 59f2bf1864
commit 7e3d69668e
12 changed files with 24 additions and 22 deletions
--- a/src/plugins/alsa/qalsaaudioinput.h
+++ b/src/plugins/alsa/qalsaaudioinput.h
@@ -153,7 +153,6 @@ private:
    snd_pcm_uframes_t period_frames;
    snd_pcm_access_t access;
    snd_pcm_format_t pcmformat;
-    snd_timestamp_t* timestamp;
    snd_pcm_hw_params_t *hwparams;
    qreal m_volume;
 };
--- a/src/plugins/alsa/qalsaaudiooutput.h
+++ b/src/plugins/alsa/qalsaaudiooutput.h
@@ -132,7 +132,6 @@ private:
    snd_pcm_t* handle;
    snd_pcm_access_t access;
    snd_pcm_format_t pcmformat;
-    snd_timestamp_t* timestamp;
    snd_pcm_hw_params_t *hwparams;
    qreal m_volume;
 };
--- a/src/plugins/android/videonode/android_videonode.json
+++ b/src/plugins/android/videonode/android_videonode.json
@@ -1,3 +1,3 @@
 {
-    "Keys": ["sgvideonodes"]
+    "Keys": ["android"]
 }
--- a/src/plugins/videonode/egl/egl.json
+++ b/src/plugins/videonode/egl/egl.json
@@ -1,3 +1,3 @@
 {
-    "Keys": ["sgvideonodes"]
+    "Keys": ["egl"]
 }
--- a/src/plugins/videonode/imx6/imx6.json
+++ b/src/plugins/videonode/imx6/imx6.json
@@ -1,3 +1,3 @@
 {
-    "Keys": ["sgvideonodes"]
+    "Keys": ["imx6"]
 }