Commit fdbd924b authored by Martin Storsjö's avatar Martin Storsjö

rv34: Fix a memory leak on errors

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent bcbe4f3c
...@@ -1495,8 +1495,10 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ...@@ -1495,8 +1495,10 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
ff_rv40dsp_init(&r->rdsp); ff_rv40dsp_init(&r->rdsp);
#endif #endif
if ((ret = rv34_decoder_alloc(r)) < 0) if ((ret = rv34_decoder_alloc(r)) < 0) {
ff_MPV_common_end(&r->s);
return ret; return ret;
}
if(!intra_vlcs[0].cbppattern[0].bits) if(!intra_vlcs[0].cbppattern[0].bits)
rv34_init_tables(); rv34_init_tables();
...@@ -1517,8 +1519,10 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx) ...@@ -1517,8 +1519,10 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx)
r->tmp_b_block_base = NULL; r->tmp_b_block_base = NULL;
if ((err = ff_MPV_common_init(&r->s)) < 0) if ((err = ff_MPV_common_init(&r->s)) < 0)
return err; return err;
if ((err = rv34_decoder_alloc(r)) < 0) if ((err = rv34_decoder_alloc(r)) < 0) {
ff_MPV_common_end(&r->s);
return err; return err;
}
} }
return 0; return 0;
......
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