Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/graphparser.c

@@@ -132,10 -130,11 +132,11 @@@ static int create_filter(AVFilterContex
          if (args)
              av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
          av_log(log_ctx, AV_LOG_ERROR, "\n");
 -        return ret;
+         avfilter_free(*filt_ctx);
      }
  
 -    return 0;
 +    av_free(tmp_args);
 +    return ret;
  }
  
  /**