* commit '7f596368':
  bink: Factorize bink put_pixel

Conflicts:
	libavcodec/bink.c

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