summaryrefslogtreecommitdiff
path: root/libavcodec/encode.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-03 11:49:18 -0300
committerJames Almer <jamrial@gmail.com>2017-10-03 14:00:27 -0300
commit87e625c2633a83f62f155fcca33dab0a6e2bb5e6 (patch)
tree00b08234036e53228a414f01139ada44054d3e82 /libavcodec/encode.c
parentef973bd98d8ee35dbbdd622b075c50d11c0d67fd (diff)
downloadffmpeg-87e625c2633a83f62f155fcca33dab0a6e2bb5e6.tar.gz
avcodec/encode: do proper cleanup on failure
Fixes the last remaining memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/encode.c')
-rw-r--r--libavcodec/encode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index c152228c92..c961dbace1 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -225,9 +225,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
} else if (!avpkt->buf) {
AVPacket tmp = { 0 };
ret = av_packet_ref(&tmp, avpkt);
- if (ret < 0)
- return ret;
av_packet_unref(avpkt);
+ if (ret < 0)
+ goto end;
*avpkt = tmp;
}
}
@@ -324,9 +324,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
} else if (!avpkt->buf) {
AVPacket tmp = { 0 };
ret = av_packet_ref(&tmp, avpkt);
+ av_packet_unref(avpkt);
if (ret < 0)
return ret;
- av_packet_unref(avpkt);
*avpkt = tmp;
}
}