Merged revisions 66074 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 25 May 2007 01:37:50 +0000 (01:37 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 25 May 2007 01:37:50 +0000 (01:37 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66074 | file | 2007-05-24 18:16:58 -0400 (Thu, 24 May 2007) | 2 lines

Fix slinfactory logic when dealing with frames coming in that may already be in the signed linear format.

........

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

main/slinfactory.c

index 6171eb2..5061a60 100644 (file)
@@ -72,11 +72,13 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
                                sf->format = f->subclass;
                        }
                }
+               if (!(begin_frame = ast_translate(sf->trans, f, 0)) || !(duped_frame = ast_frdup(begin_frame)))
+                       return 0;
+       } else {
+               if (!(duped_frame = ast_frdup(f)))
+                       return 0;
        }
 
-       if ((sf->trans && (!(begin_frame = ast_translate(sf->trans, f, 0)))) || (!(duped_frame = ast_frdup(begin_frame))))
-               return 0;
-
        x = 0;
        AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list)
                x++;