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>

diff --cc libavcodec/utils.c
index b1980c01fe319be3d3eef042244ba0f46ca417d6,b35ef51ac036cceb4860c8fa7209fad67bacbdd8..79bfe1d35570bb33c40f56fb54ef6126ce309ef2
--- 1/libavcodec/utils.c
--- 2/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) {
-                 return AVERROR(EINVAL);
 +                av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d) (avcodec_encode_audio2)\n", frame->nb_samples, avctx->frame_size);
+                 ret = AVERROR(EINVAL);
+                 goto end;
              }
          }
      }