aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-07-18 08:48:28 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-07-18 08:48:28 +0200
commit4714fe46d8ee1bfd43fbe936d1d50402411e3446 (patch)
tree8f9066b67eeed33b734308daa44323162e61679f /src
parent95c66aa56274c76b7a1963debc9ebcddb7fcc9a8 (diff)
downloadODR-SourceCompanion-4714fe46d8ee1bfd43fbe936d1d50402411e3446.tar.gz
ODR-SourceCompanion-4714fe46d8ee1bfd43fbe936d1d50402411e3446.tar.bz2
ODR-SourceCompanion-4714fe46d8ee1bfd43fbe936d1d50402411e3446.zip
Fix bitrate check and a warning
Diffstat (limited to 'src')
-rw-r--r--src/AVTEDIInput.cpp2
-rw-r--r--src/AVTInput.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/AVTEDIInput.cpp b/src/AVTEDIInput.cpp
index 591fe43..72c4f09 100644
--- a/src/AVTEDIInput.cpp
+++ b/src/AVTEDIInput.cpp
@@ -297,7 +297,7 @@ bool AVTEDIInput::_pushAF(uint8_t* buf, size_t length, bool checked)
if (ok) {
// Extract the first stream and FrameCount from AF
int tagIndex = index;
- uint32_t frameCount;
+ uint32_t frameCount = 0;
bool frameCountFound = false;
int est0Index = 0;
size_t est0Length = 0;
diff --git a/src/AVTInput.cpp b/src/AVTInput.cpp
index e8dbe16..ce65041 100644
--- a/src/AVTInput.cpp
+++ b/src/AVTInput.cpp
@@ -192,7 +192,7 @@ int AVTInput::setDabPlusParameters(int bitrate, int channels, int sample_rate, b
_subChannelIndex = bitrate / 8;
_bitRate = bitrate * 1000;
_dab24msFrameSize = bitrate * 3;
- if (_subChannelIndex * 8 != bitrate || _subChannelIndex < 1 | _subChannelIndex > 24) {
+ if (_subChannelIndex * 8 != bitrate || _subChannelIndex < 1 || _subChannelIndex > 24) {
ERROR("Bad bitrate for DAB+ (8..192)");
return 1;
}