diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 13:55:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 13:55:43 +0200 |
| commit | fecfdf6e72bd29c90f6b98d5dbca631469b374ec (patch) | |
| tree | 220eca7683fa0bd192ee24ecc8058845e934c0bb | |
| parent | f0bb88e2bc8b20e0181e73ae71b62bcf1eb081b5 (diff) | |
| parent | 0ccf051a9def7095ac45b1dca427b39bcf15608d (diff) | |
| download | ffmpeg-fecfdf6e72bd29c90f6b98d5dbca631469b374ec.tar.gz | |
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>
| -rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b1980c01fe..79bfe1d355 100644 --- 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) |