From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 23 Sep 2012 11:55:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: n1.1-dev~88
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fecfdf6e72bd29c90f6b98d5dbca631469b374ec

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: fix memleak in avcodec_encode_audio2()

Conflicts:
	libavcodec/utils.c

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

fecfdf6e72bd29c90f6b98d5dbca631469b374ec
diff --cc libavcodec/utils.c
index b1980c0,b35ef51..79bfe1d
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -1169,8 -982,8 +1169,9 @@@ int attribute_align_arg avcodec_encode_
              }
  
              if (frame->nb_samples != avctx->frame_size) {
 +                av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d) (avcodec_encode_audio2)\n", frame->nb_samples, avctx->frame_size);
-                 return AVERROR(EINVAL);
+                 ret = AVERROR(EINVAL);
+                 goto end;
              }
          }
      }