Undo unnecessary commit. Sean Bright beat me to the punch on this one.

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index cdc479ecc271e1264c5e19e9eae73915214a3163..86398dbae28be9dea95c746bd111f41669f621e3 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19075,8 +19075,6 @@ static int acf_channel_read(struct ast_channel *chan, const char *funcname, char
                        stream = p->vrtp;
                } else if (!strcasecmp(args.type, "text")) {
                        stream = p->trtp;
-               } else {
-                       stream = NULL;
                }
 
                if (!stream) {