[FFmpeg-cvslog] Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  2 19:28:54 2014 +0200| [fa4e17c14035ebf43130fb369e1728cdd98d0b72] | committer: Michael Niedermayer

Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'

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

Conflicts:
	libavcodec/bink.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa4e17c14035ebf43130fb369e1728cdd98d0b72
---