RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-05 06:40:03 +00:00
Code Issues Projects Releases Wiki Activity

svq1dec: replace VLA with malloc/free

Browse Source 
Originally committed as revision 23794 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-06-26 14:34:08 +00:00
parent bf9aa44bf4
commit 5228bcd870
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/svq1dec.c
View File

@ -650,6 +650,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,
uint8_t *current, *previous; uint8_t *current, *previous;
int result, i, x, y, width, height; int result, i, x, y, width, height;
AVFrame *pict = data; AVFrame *pict = data;
svq1_pmv *pmv;
/* initialize bit buffer */ /* initialize bit buffer */
init_get_bits(&s->gb,buf,buf_size*8); init_get_bits(&s->gb,buf,buf_size*8);
@ -692,6 +693,10 @@ static int svq1_decode_frame(AVCodecContext *avctx,
if(MPV_frame_start(s, avctx) < 0) if(MPV_frame_start(s, avctx) < 0)
return -1; return -1;
pmv = av_malloc((FFALIGN(s->width, 16)/8 + 3) * sizeof(*pmv));
if (!pmv)
return -1;
/* decode y, u and v components */ /* decode y, u and v components */
for (i=0; i < 3; i++) { for (i=0; i < 3; i++) {
int linesize; int linesize;
@ -724,13 +729,12 @@ static int svq1_decode_frame(AVCodecContext *avctx,
//#ifdef DEBUG_SVQ1 //#ifdef DEBUG_SVQ1
av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_block %i (keyframe)\n",result); av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_block %i (keyframe)\n",result);
//#endif //#endif
return result; goto err;
} }
} }
current += 16*linesize; current += 16*linesize;
} }
} else { } else {
svq1_pmv pmv[width/8+3];
/* delta frame */ /* delta frame */
memset (pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv)); memset (pmv, 0, ((width / 8) + 3) * sizeof(svq1_pmv));
@ -743,7 +747,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,
#ifdef DEBUG_SVQ1 #ifdef DEBUG_SVQ1
av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_delta_block %i\n",result); av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_delta_block %i\n",result);
#endif #endif
return result; goto err;
} }
} }
@ -761,7 +765,10 @@ static int svq1_decode_frame(AVCodecContext *avctx,
MPV_frame_end(s); MPV_frame_end(s);
*data_size=sizeof(AVFrame); *data_size=sizeof(AVFrame);
return buf_size; result = buf_size;
err:
av_free(pmv);
return result;
} }
static av_cold int svq1_decode_init(AVCodecContext *avctx) static av_cold int svq1_decode_init(AVCodecContext *avctx)