From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 11 Jan 2016 14:23:54 +0000 (+0100)
Subject: parsers: AAC - fix startcode check, fixes #3383
X-Git-Tag: v4.2.1~1179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd36886ec9d64667dee25eed55378ed27a35ec35;p=thirdparty%2Ftvheadend.git

parsers: AAC - fix startcode check, fixes #3383
---

diff --git a/src/parsers/parsers.c b/src/parsers/parsers.c
index 621fb05f8..c07cf7d44 100644
--- a/src/parsers/parsers.c
+++ b/src/parsers/parsers.c
@@ -288,7 +288,7 @@ parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data,
   while((l = st->es_buf.sb_ptr - p) > 3) {
     const uint8_t *d = st->es_buf.sb_data + p;
     /* Startcode check */
-    if(d[0] == 0 || d[1] == 0 || d[2] == 1) {
+    if(d[0] == 0 && d[1] == 0 && d[2] == 1) {
       p += 4;
     /* LATM */
     } else if(latm != 0 && d[0] == 0x56 && (d[1] & 0xe0) == 0xe0) {
@@ -318,7 +318,6 @@ parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data,
         break;
 
       if (muxlen < 7) {
-        tvhtrace("parser", "AAC/ATDS skip byte %02x", d[0]);
         p++;
         continue;
       }