virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/snow: Fix av_malloc* failure checks

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-12 23:15:32 +01:00
parent 13871a95d0
commit 56c7e1059a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/snow.c
View File

@ -594,11 +594,18 @@ static int halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *fra
int ls= frame->linesize[p]; int ls= frame->linesize[p];
uint8_t *src= frame->data[p]; uint8_t *src= frame->data[p];
halfpel[1][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); halfpel[1][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH));
halfpel[2][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); halfpel[2][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH));
halfpel[3][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls); halfpel[3][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH));
if (!halfpel[1][p] || !halfpel[2][p] || !halfpel[3][p]) if (!halfpel[1][p] || !halfpel[2][p] || !halfpel[3][p]) {
av_freep(&halfpel[1][p]);
av_freep(&halfpel[2][p]);
av_freep(&halfpel[3][p]);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
halfpel[1][p] += EDGE_WIDTH * (1 + ls);
halfpel[2][p] += EDGE_WIDTH * (1 + ls);
halfpel[3][p] += EDGE_WIDTH * (1 + ls);
halfpel[0][p]= src; halfpel[0][p]= src;
for(y=0; y<h; y++){ for(y=0; y<h; y++){