summaryrefslogtreecommitdiff
path: root/libavcodec/snow.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-07-02 10:39:54 +0300
committerMartin Storsjö <martin@martin.st>2012-07-03 16:31:23 +0300
commit33895451570742c47404fec52d87a5c71de26b83 (patch)
treefefe88ccf8c1ac85e9f874d429a43f7e9ea88842 /libavcodec/snow.c
parentfb93e61e2b7baa44ff991bc0ce96291490a0188e (diff)
snow: remove a VLA used for edge emulation
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/snow.c')
-rw-r--r--libavcodec/snow.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 629367ac44..d69f452e5d 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -395,6 +395,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
SnowContext *s = avctx->priv_data;
int width, height;
int i, j, ret;
+ int emu_buf_size;
s->avctx= avctx;
s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe
@@ -462,6 +463,8 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
return ret;
}
FF_ALLOC_OR_GOTO(avctx, s->scratchbuf, s->mconly_picture.linesize[0]*7*MB_SIZE, fail);
+ emu_buf_size = s->mconly_picture.linesize[0] * (2 * MB_SIZE + HTAPS_MAX - 1);
+ FF_ALLOC_OR_GOTO(avctx, s->emu_edge_buffer, emu_buf_size, fail);
return 0;
fail:
@@ -648,6 +651,7 @@ av_cold void ff_snow_common_end(SnowContext *s)
av_freep(&s->block);
av_freep(&s->scratchbuf);
+ av_freep(&s->emu_edge_buffer);
for(i=0; i<MAX_REF_FRAMES; i++){
av_freep(&s->ref_mvs[i]);