summaryrefslogtreecommitdiff
path: root/formats
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-01-04 23:45:58 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-01-04 23:45:58 +0000
commite8f9ee8f6a8934edc9d72f9b2fec107ca3ea001d (patch)
tree46a84b105c36bdb86b542f97410b554a4364827c /formats
parentce81ea81221ba91c5931ead9b437b0fec4c5ad7c (diff)
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
Diffstat (limited to 'formats')
-rw-r--r--formats/format_pcm.c1
-rw-r--r--formats/format_pcm_alaw.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 80905cdbf..7a1e98b7a 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 885246726..811a6ef6a 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: