[asterisk-commits] seanbright: branch 1.4 r143903 - /branches/1.4/formats/format_pcm.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Sep 22 17:49:00 2008
New Revision: 143903

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143903
Log:
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.4/formats/format_pcm.c

Modified: branches/1.4/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/formats/format_pcm.c?view=diff&rev=143903&r1=143902&r2=143903
==============================================================================
--- branches/1.4/formats/format_pcm.c (original)
+++ branches/1.4/formats/format_pcm.c Mon Sep 22 17:49:00 2008
@@ -284,9 +284,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) {