* commit 'bda9e6d9':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
	libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>