[asterisk-commits] trunk - r7804 in /trunk: ./ formats/format_pcm.c formats/format_pcm_alaw.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jan  4 17:45:58 2006
New Revision: 7804

URL: http://svn.digium.com/view/asterisk?rev=7804&view=rev
Log:
Merged revisions 7803 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7803 | kpfleming | 2006-01-04 17:45:34 -0600 (Wed, 04 Jan 2006) | 2 lines

return properly after extending file

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_pcm.c
    trunk/formats/format_pcm_alaw.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan  4 17:45:58 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7800
+/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7803

Modified: trunk/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm.c?rev=7804&r1=7803&r2=7804&view=diff
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Wed Jan  4 17:45:58 2006
@@ -207,6 +207,7 @@
 					return res;
 				left -= res;
 			}
+			return offset;
 		}
 		/* fall through */
 	default:

Modified: trunk/formats/format_pcm_alaw.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm_alaw.c?rev=7804&r1=7803&r2=7804&view=diff
==============================================================================
--- trunk/formats/format_pcm_alaw.c (original)
+++ trunk/formats/format_pcm_alaw.c Wed Jan  4 17:45:58 2006
@@ -282,6 +282,7 @@
 					return res;
 				left -= res;
 			}
+			return offset;
 		}
 		/* fall through */
 	default: