2 files changed, 6 insertions, 1 deletions

diff --git a/lib/rbcodec/metadata/aac.c b/lib/rbcodec/metadata/aac.c
index 358b2de079..372bab716e 100644
--- a/lib/rbcodec/metadata/aac.c
+++ b/lib/rbcodec/metadata/aac.c
@@ -93,11 +93,13 @@ bool get_aac_metadata(int fd, struct mp3entry *entry)
                 break;
         }
         entry->bitrate = (unsigned int)((total * entry->frequency / frames + 64000) / 128000);
+#ifdef CODEC_AAC_SBR_DEC
         if (entry->frequency <= 24000)
         {
             entry->frequency <<= 1;
             entry->needs_upsampling_correction = true;
         }
+#endif
     }
     else
     {
diff --git a/lib/rbcodec/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c
index e05a588e7e..706a50e503 100644
--- a/lib/rbcodec/metadata/mp4.c
+++ b/lib/rbcodec/metadata/mp4.c
@@ -349,7 +349,10 @@ static bool read_mp4_esds(int fd, struct mp3entry* id3, uint32_t* size)
                 }
             }
         }
-        
+#ifndef CODEC_AAC_SBR_DEC
+        //SBR_DEC is disabled so disable sbr implicit signalling
+        sbr_signaled = true;
+#endif
         if (!sbr && !sbr_signaled && id3->frequency <= 24000)
         {
             /* As stated in libfaad/mp4.c AudioSpecificConfig2: