diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/asterisk/patches/patch-channels_chan_oss_c | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/asterisk/patches/patch-channels_chan_oss_c')
| -rw-r--r-- | package/asterisk/patches/patch-channels_chan_oss_c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c deleted file mode 100644 index 33e9aaad7..000000000 --- a/package/asterisk/patches/patch-channels_chan_oss_c +++ /dev/null @@ -1,37 +0,0 @@ ---- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200 -+++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100 -@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p - l = FRAME_SIZE - ofs; - if (l > s->datalen - start) /* don't overflow the source */ - l = s->datalen - start; -- bcopy(s->data + start, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, s->data + start, l * 2); - if (0) - ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); - l_sampsent += l; -@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p - if (l > 0) { - if (l > FRAME_SIZE - ofs) - l = FRAME_SIZE - ofs; -- bcopy(silence, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, silence, l * 2); - l_sampsent += l; - } else { /* silence is over, restart sound if loop */ - if (s->repeat == 0) { /* last block */ - o->cursound = -1; - o->nosound = 0; /* allow audio data */ - if (ofs < FRAME_SIZE) /* pad with silence */ -- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); -+ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2); - } - l_sampsent = 0; - } -@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct - - /* XXX can be simplified returning &ast_null_frame */ - /* prepare a NULL frame in case we don't have enough data to return */ -- bzero(f, sizeof(struct ast_frame)); -+ memset(f, 0, sizeof(struct ast_frame)); - f->frametype = AST_FRAME_NULL; - f->src = oss_tech.type; - |