Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'

* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
  svq3: move edge_emu_buffer to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/svq3.c
index 93539fa,5564d29..d5ed692
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/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);
      }