diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-18 10:32:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-18 05:56:15 +0200 |
commit | 1403a1c7be7892ad4d1c5d04c143a318055fb36b (patch) | |
tree | 22a4caf3f5a119dcb12874ee72d2a9bb7dd88a55 /src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp | |
parent | 7085775a115421e5fbecc02679da1558c5178e84 (diff) | |
download | qtmultimedia-1403a1c7be7892ad4d1c5d04c143a318055fb36b.tar.gz |
Remove some obsolete bits.
They can be updated again later when things are more stable, if needed.
Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp')
-rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp index dc6ce9894..81557ba0c 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp @@ -52,9 +52,7 @@ QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent) { QList<QByteArray> codecCandidates; -#if defined(Q_WS_MAEMO_5) - codecCandidates << "audio/PCM"; //<< "audio/AMR" << "audio/AMR-WB" << "audio/speex"; -#elif defined(Q_WS_MAEMO_6) +#if defined(Q_WS_MAEMO_6) codecCandidates << "audio/AAC" << "audio/mpeg" << "audio/vorbis" << "audio/speex" << "audio/GSM" << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC"; #else @@ -62,7 +60,7 @@ QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent) << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC"; #endif -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#if defined(Q_WS_MAEMO_6) m_elementNames["audio/AMR"] = "nokiaamrnbenc"; m_elementNames["audio/AMR-WB"] = "nokiaamrwbenc"; m_elementNames["audio/AAC"] = "nokiaaacenc"; |