Merged revisions 65853 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 24 May 2007 15:04:51 +0000 (15:04 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 24 May 2007 15:04:51 +0000 (15:04 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65853 | russell | 2007-05-24 10:04:14 -0500 (Thu, 24 May 2007) | 4 lines

Ensure that frames are fully initialized.  This will probably fix getting
weird timestamp log messages in logs when using the Festival app.
(issue #9781, patch by me)

........

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

apps/app_festival.c

index 678b8cd..22a799f 100644 (file)
@@ -180,7 +180,9 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
                struct ast_frame f;
                char offset[AST_FRIENDLY_OFFSET];
                char frdata[2048];
-       } myf;
+       } myf = {
+               .f = { 0, },
+       };
        
         if (pipe(fds)) {
                  ast_log(LOG_WARNING, "Unable to create pipe\n");
@@ -241,7 +243,6 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
                                        myf.f.subclass = AST_FORMAT_SLINEAR;
                                        myf.f.datalen = res;
                                        myf.f.samples = res / 2;
-                                       myf.f.mallocd = 0;
                                        myf.f.offset = AST_FRIENDLY_OFFSET;
                                        myf.f.src = __PRETTY_FUNCTION__;
                                        myf.f.data = myf.frdata;