* commit 'b88cc5cc':
  bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext

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