Commit e0b187e7 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure

Fixes Ticket5139
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 02bd02da
......@@ -52,6 +52,8 @@
#include "thread.h"
#include "vdpau_compat.h"
static int h264_decode_end(AVCodecContext *avctx);
const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx)
......@@ -679,7 +681,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
if (avctx->extradata_size > 0 && avctx->extradata) {
ret = ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size);
if (ret < 0) {
ff_h264_free_context(h);
h264_decode_end(avctx);
return ret;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment