diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-19 18:30:38 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-19 18:30:38 +0000 |
commit | 3634668b2964a9691aaa6a76e489d773e0c33f9b (patch) | |
tree | f7b4da587bc9764831d2a6d0e1e275c8105a1432 /formats | |
parent | 429b7c6d51fa3a4d8c65e084f09ebf4961c57308 (diff) |
Merged revisions 10487 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r10487 | tilghman | 2006-02-19 12:29:16 -0600 (Sun, 19 Feb 2006) | 2 lines
Okay, fseek doesn't return an offset
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10488 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r-- | formats/format_sln.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/formats/format_sln.c b/formats/format_sln.c index c1a16618d..d155b09a2 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -172,7 +172,6 @@ static int slinear_write(struct ast_filestream *fs, struct ast_frame *f) static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whence) { off_t offset=0,min,cur,max; - int res; min = 0; sample_offset <<= 1; @@ -190,12 +189,7 @@ static int slinear_seek(struct ast_filestream *fs, long sample_offset, int whenc } /* always protect against seeking past begining. */ offset = (offset < min)?min:offset; - res = fseek(fs->f, offset, SEEK_SET); - /* Negative values indicate error */ - if (res > -1) - return res / 2; - else - return res; + return fseek(fs->f, offset, SEEK_SET); } static int slinear_trunc(struct ast_filestream *fs) |