Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'

* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
  indeo3: replace use of copy_block4 with put_pixels
  mjpegdec: use put_pixels instead of copy_block8

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/indeo3.c
Simple merge

diff --cc libavcodec/mjpegdec.c
index 299c0817ecd837a103f3ee84bb513daaf82e2d78,e63287a46b81cc1bda033628f6d0067493801755..3b654cebbd4d9443826409dc7c0f66179de6ff12
--- 1/libavcodec/mjpegdec.c
--- 2/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@@ -987,21 -798,6 +987,22 @@@ static int ljpeg_decode_yuv_scan(MJpegD
      return 0;
  }
  
- static av_always_inline void mjpeg_copy_block(uint8_t *dst, const uint8_t *src,
++static av_always_inline void mjpeg_copy_block(MJpegDecodeContext *s,
++                                              uint8_t *dst, const uint8_t *src,
 +                                              int linesize, int lowres)
 +{
 +    switch (lowres) {
-     case 0: copy_block8(dst, src, linesize, linesize, 8);
++    case 0: s->dsp.put_pixels_tab[1][0](dst, src, linesize, 8);
 +        break;
 +    case 1: copy_block4(dst, src, linesize, linesize, 4);
 +        break;
 +    case 2: copy_block2(dst, src, linesize, linesize, 2);
 +        break;
 +    case 3: *dst = *src;
 +        break;
 +    }
 +}
 +
  static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
                               int Al, const uint8_t *mb_bitmask,
                               const AVFrame *reference)
@@@ -1067,8 -864,9 +1068,9 @@@
                      ptr = data[c] + block_offset;
                      if (!s->progressive) {
                          if (copy_mb)
-                             mjpeg_copy_block(ptr, reference_data[c] + block_offset,
 -                            s->dsp.put_pixels_tab[1][0](ptr,
 -                                reference_data[c] + block_offset,
 -                                linesize[c], 8);
++                            mjpeg_copy_block(s, ptr, reference_data[c] + block_offset,
 +                                             linesize[c], s->avctx->lowres);
++
                          else {
                              s->dsp.clear_block(s->block);
                              if (decode_block(s, s->block, i,