diff options
| -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) |