diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-22 22:52:16 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-22 22:52:16 +0000 |
| commit | 6a8be5373170df5544b18815bb684076986c22e0 (patch) | |
| tree | ddb7a754c078d7ba1ffc709096fce47552b958dc | |
| parent | 69a5536a175f082553e583bd741e7b4cd8563af9 (diff) | |
Merged revisions 143904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r143904 | seanbright | 2008-09-22 18:50:07 -0400 (Mon, 22 Sep 2008) | 16 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@143906 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | formats/format_pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 75d3ce66f..60f32892f 100644 --- 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) { |