Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 17:28:54 +0000 (19:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 17:28:54 +0000 (19:28 +0200)
commitfa4e17c14035ebf43130fb369e1728cdd98d0b72
tree76b5cfde975878535eeee8a0aa7c691d2fb7177a
parent666e29fe9e7eb9a87eb870f0e6d68331c0615d43
parentb88cc5cca111132b42c2ee99662bfefe7652e3da
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@gmx.at>
libavcodec/bink.c