Merge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:08:11 +0000 (12:08 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:08:11 +0000 (12:08 +0100)
* commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f':
  intrax8: Use local destination buffers

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

@@@ -700,7 -704,7 +700,7 @@@ static int x8_decode_intra_mb(IntraX8Co
                                                 s->current_picture.f->linesize[!!chroma]);
      }
      if (!zeros_only)
-         w->wdsp.idct_add(s->dest[chroma],
 -        s->idsp.idct_add(w->dest[chroma],
++        w->wdsp.idct_add(w->dest[chroma],
                           s->current_picture.f->linesize[!!chroma],
                           s->block[0]);
  
Simple merge