[FFmpeg-cvslog] r13324 - trunk/libavfilter/graphparser.c

[vitor]

Author: vitor
Date: Sat May 24 22:40:44 2008
New Revision: 13324

Log:
Simplify extract_inout() as suggested by Michael
Commited in SoC by Vitor Sessak on 2008-04-23 18:01:31


Modified:
   trunk/libavfilter/graphparser.c

Modified: trunk/libavfilter/graphparser.c
==============================================================================
--- trunk/libavfilter/graphparser.c	(original)
+++ trunk/libavfilter/graphparser.c	Sat May 24 22:40:44 2008
@@ -179,26 +179,15 @@ static void free_inout(AVFilterInOut *he
 static AVFilterInOut *extract_inout(const char *label, AVFilterInOut **links)
 {
     AVFilterInOut *ret;
-    AVFilterInOut *p;
 
-    if(!links || !*links)
-        return NULL;
 
-    if(!strcmp((*links)->name, label)) {
-        ret = *links;
-        *links = (*links)->next;
-        return ret;
-    }
-
-    /* First check if the label is not in the openLinks list */
-    for(p = *links; p->next && strcmp(p->next->name, label); p = p->next);
-
-    if(!p->next)
-        return NULL;
+    while(*links && strcmp((*links)->name, label))
+        links= &((*links)->next);
 
-    ret = p->next;
+    ret= *links;
 
-    p->next = p->next->next;
+    if(ret)
+        *links= ret->next;
 
     return ret;
 }