From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 20 Apr 2015 10:12:48 +0000 (+0200)
Subject: Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0c9e78caf4ed2c4e881c22190d7ca145fac276c2;p=ffmpeg

Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'

* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

0c9e78caf4ed2c4e881c22190d7ca145fac276c2
diff --cc libavfilter/buffersrc.c
index 1cef1d6a100,f7680633091..c4b7af42627
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@@ -240,8 -193,9 +240,9 @@@ do 
          goto fail;                                                      \
      }                                                                   \
      ref_out = av_buffer_create(data, data_size, compat_unref_buffer,    \
 -                               dummy_ref, 0);                           \
 +                               dummy_ref, (buf->perms & AV_PERM_WRITE) ? 0 : AV_BUFFER_FLAG_READONLY);                           \
      if (!ref_out) {                                                     \
+         av_freep(&dummy_ref);                                           \
          av_frame_unref(frame);                                          \
          ret = AVERROR(ENOMEM);                                          \
          goto fail;                                                      \