]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 10:12:48 +0000 (12:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 10:15:16 +0000 (12:15 +0200)
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

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

index 1cef1d6a10014506838c495bc35342f30b7293f1,f7680633091acd724d56b16d124e6dd3b2c454e1..c4b7af42627ce56e23f667ae6b785ee07cfc7bc4
@@@ -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;                                                      \