virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

rv34: Fix a memory leak on errors

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-09-16 16:05:18 +03:00
parent bcbe4f3ceb
commit fdbd924b84
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/rv34.c
View File

@ -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,9 +1519,11 @@ 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;
} }