Merged revisions 143903 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r143903 | seanbright | 2008-09-22 18:49:00 -0400 (Mon, 22 Sep 2008) | 8 lines

Use the advertised header size in .au files instead of just assuming they
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/trunk@143904 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 75d3ce66f5584e36f6eb5a02be09552f3ae74dbe..60f32892f4b12f939a5ad717411aabbc6f77d2e7 100644 (file)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -271,9 +271,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) {