summaryrefslogtreecommitdiffstats
path: root/src/encoder
diff options
context:
space:
mode:
authorRJ Skerry-Ryan <rryan@mixxx.org>2019-01-12 15:09:14 -0800
committerRJ Skerry-Ryan <rryan@mixxx.org>2019-01-12 18:37:57 -0800
commit4fe4653b859f0555874343d7e9309304e1eb8b93 (patch)
treee9267a2644c15482cc90dfc122fb78d1c0954ba3 /src/encoder
parent8d4e244e4de650c4fe06c79b127078d978a669c0 (diff)
Fix the build when opus is disabled and add Opus streaming/recording to the changelog.
Diffstat (limited to 'src/encoder')
-rw-r--r--src/encoder/encoder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp
index 77cbe87f58..7e37d725e7 100644
--- a/src/encoder/encoder.cpp
+++ b/src/encoder/encoder.cpp
@@ -30,8 +30,8 @@
#ifdef __OPUS__
#include "encoder/encoderopus.h"
-#include "encoder/encoderopussettings.h"
#endif
+#include "encoder/encoderopussettings.h"
#include <QList>
@@ -71,7 +71,7 @@ Encoder::Format EncoderFactory::getFormatFor(QString formatText) const
return format;
}
}
- qWarning() << "Format: " << formatText << " not recognized! Returning format "
+ qWarning() << "Format: " << formatText << " not recognized! Returning format "
<< m_formats.first().internalName;
return m_formats.first();
}