Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:47:52 +0000 (16:47 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Apr 2016 15:47:52 +0000 (16:47 +0100)
* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
  svq3: move edge_emu_buffer to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/svq3.c

@@@ -1290,9 -1266,9 +1292,9 @@@ static int get_buffer(AVCodecContext *a
      if (ret < 0)
          goto fail;
  
-     if (!sl->edge_emu_buffer) {
-         sl->edge_emu_buffer = av_mallocz_array(pic->f->linesize[0], 17);
-         if (!sl->edge_emu_buffer)
+     if (!s->edge_emu_buffer) {
 -        s->edge_emu_buffer = av_mallocz(pic->f->linesize[0] * 17);
++        s->edge_emu_buffer = av_mallocz_array(pic->f->linesize[0], 17);
+         if (!s->edge_emu_buffer)
              return AVERROR(ENOMEM);
      }