]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Use the advertised header size in .au files instead of just assuming they
authorSean Bright <sean@malleable.com>
Mon, 22 Sep 2008 22:49:00 +0000 (22:49 +0000)
committerSean Bright <sean@malleable.com>
Mon, 22 Sep 2008 22:49:00 +0000 (22:49 +0000)
are 24 bytes (the minimum).

(closes issue #13450)
Reported by: jamessan
Patches:
      pcm-header.diff uploaded by jamessan (license 246)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@143903 65c4cc65-6c06-0410-ace0-fbb531ad65f3

formats/format_pcm.c

index 7b186e6021278bf25a20756d2e8451383c4bafab..a3deced7ae04f325d49b2139dd9e4ed012b91baf 100644 (file)
@@ -284,9 +284,10 @@ static int check_header(FILE *f)
        if (magic != (uint32_t) AU_MAGIC) {
                ast_log(LOG_WARNING, "Bad magic: 0x%x\n", magic);
        }
-/*     hdr_size = ltohl(header[AU_HDR_HDR_SIZE_OFF]);
-       if (hdr_size < AU_HEADER_SIZE)*/
-       hdr_size = AU_HEADER_SIZE;
+       hdr_size = ltohl(header[AU_HDR_HDR_SIZE_OFF]);
+       if (hdr_size < AU_HEADER_SIZE) {
+               hdr_size = AU_HEADER_SIZE;
+       }
 /*     data_size = ltohl(header[AU_HDR_DATA_SIZE_OFF]); */
        encoding = ltohl(header[AU_HDR_ENCODING_OFF]);
        if (encoding != AU_ENC_8BIT_ULAW) {