From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 4 Jan 2006 23:45:58 +0000 (+0000)
Subject: Merged revisions 7803 via svnmerge from
X-Git-Tag: 1.4.0-beta1~3070
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8f9ee8f6a8934edc9d72f9b2fec107ca3ea001d;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 80905cdbf3..7a1e98b7a7 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -207,6 +207,7 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 					return res;
 				left -= res;
 			}
+			return offset;
 		}
 		/* fall through */
 	default:
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index 8852467269..811a6ef6a6 100644
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -282,6 +282,7 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
 					return res;
 				left -= res;
 			}
+			return offset;
 		}
 		/* fall through */
 	default: