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 --git a/libavcodec/utils.c b/libavcodec/utils.c
index b1980c01fe319be3d3eef042244ba0f46ca417d6..79bfe1d35570bb33c40f56fb54ef6126ce309ef2 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1170,7 +1170,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
 
             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;
             }
         }
     }
@@ -1222,7 +1223,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
     if (ret < 0 || !*got_packet_ptr) {
         av_free_packet(avpkt);
         av_init_packet(avpkt);
-        return ret;
+        goto end;
     }
 
     /* NOTE: if we add any audio encoders which output non-keyframe packets,
@@ -1230,6 +1231,7 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
      *       here to simplify things */
     avpkt->flags |= AV_PKT_FLAG_KEY;
 
+end:
     if (padded_frame) {
         av_freep(&padded_frame->data[0]);
         if (padded_frame->extended_data != padded_frame->data)