eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 11:30:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-09-23 13:55:43 +02:00
parent f0bb88e2bc 0ccf051a9d
commit fecfdf6e72
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/utils.c
View File

@@ -1170,7 +1170,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
if (frame->nb_samples != avctx->frame_size) { 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); 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) { if (ret < 0 || !*got_packet_ptr) {
av_free_packet(avpkt); av_free_packet(avpkt);
av_init_packet(avpkt); av_init_packet(avpkt);
return ret; goto end;
} }
/* NOTE: if we add any audio encoders which output non-keyframe packets, /* 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 */ * here to simplify things */
avpkt->flags |= AV_PKT_FLAG_KEY; avpkt->flags |= AV_PKT_FLAG_KEY;
end:
if (padded_frame) { if (padded_frame) {
av_freep(&padded_frame->data[0]); av_freep(&padded_frame->data[0]);
if (padded_frame->extended_data != padded_frame->data) if (padded_frame->extended_data != padded_frame->data)