]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 7803 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 4 Jan 2006 23:45:58 +0000 (23:45 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 4 Jan 2006 23:45:58 +0000 (23:45 +0000)
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

formats/format_pcm.c
formats/format_pcm_alaw.c

index 80905cdbf3ae2f1f30cb46118568a753f0604789..7a1e98b7a7ecc47aee9a5cf1a6ec855f796ee86e 100644 (file)
@@ -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:
index 885246726957bfacfacaf66ee787aea547b25e81..811a6ef6a6b29eca14ac38558b7b00ee2ee3c380 100644 (file)
@@ -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: