Change in libosmo-netif[master]: amr: don't rely on pad bits to be zero

[pespin]

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/26715 )

Change subject: amr: don't rely on pad bits to be zero
......................................................................

amr: don't rely on pad bits to be zero

Change-Id: I354fbbcbaf7ff7e7d498b22c175a57a79b6b8856
---
M src/amr.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/amr.c b/src/amr.c
index 2706432..0cd1821 100644
--- a/src/amr.c
+++ b/src/amr.c
@@ -152,7 +152,7 @@
                return -1;

        /* Move TOC close to CMR */
-       payload[0] |= (payload[1] >> 4) & 0x0f;
+       payload[0] = (payload[0] & 0xf0) | ((payload[1] >> 4) & 0x0f);
        payload[1] = (payload[1] << 4) & 0xf0;

        for (i = 0; i < frame_len; i++) {

--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/26715
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I354fbbcbaf7ff7e7d498b22c175a57a79b6b8856
Gerrit-Change-Number: 26715
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged