Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 11:19:21 +0000 (12:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 11:37:03 +0000 (12:37 +0100)
commite5212354eadd4acbdc1bfeeafa5e50eb1ec5c337
tree6d894a25a0c708b840e4c6868ca62e17a6df5d93
parentbcb15e66f7c46e036be198ecc9ea5f66dc0a537c
parentb9ee5f2cab3ffe1c962e542346b1ed61394864ec
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>
libavcodec/indeo3.c
libavcodec/mjpegdec.c