Merged revisions 336091 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r336091 | dvossel | 2011-09-15 10:19:10 -0500 (Thu, 15 Sep 2011) | 2 lines

  Removes some no-op code found in format_cap.c.
........

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

diff --git a/main/format_cap.c b/main/format_cap.c
index 63dc049..b632a7b 100644 (file)
--- a/main/format_cap.c
+++ b/main/format_cap.c
@@ -521,8 +521,6 @@ struct ast_format_cap *ast_format_cap_get_type(const struct ast_format_cap *cap,
        }
        result = ast_format_cap_destroy(result);
 
-       /* Remember to always free the NULL before returning it. */
-       ast_free(NULL);
        return NULL;
 }