* 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>