[asterisk-commits] seanbright: branch 1.6.1 r143906 - in /branches/1.6.1: ./ formats/format_pcm.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Sep 22 17:52:16 2008
New Revision: 143906

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143906
Log:
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)

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/formats/format_pcm.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/formats/format_pcm.c?view=diff&rev=143906&r1=143905&r2=143906
==============================================================================
--- branches/1.6.1/formats/format_pcm.c (original)
+++ branches/1.6.1/formats/format_pcm.c Mon Sep 22 17:52:16 2008
@@ -271,9 +271,10 @@
 	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) {