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>

diff --cc libavcodec/bink.c
index a28b6f0,d1e94d9..0da2c45
--- 1/libavcodec/bink.c
--- 2/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@@ -872,8 -866,8 +872,8 @@@ static int binkb_decode_plane(BinkConte
                  memset(dctblock, 0, sizeof(*dctblock) * 64);
                  dctblock[0] = binkb_get_value(c, BINKB_SRC_INTRA_DC);
                  qp = binkb_get_value(c, BINKB_SRC_INTRA_Q);
 -                read_dct_coeffs(gb, dctblock, bink_scan, binkb_intra_quant, qp);
 +                read_dct_coeffs(gb, dctblock, bink_scan, (const int32_t (*)[64])binkb_intra_quant, qp);
-                 c->bdsp.idct_put(dst, stride, dctblock);
+                 c->binkdsp.idct_put(dst, stride, dctblock);
                  break;
              case 3:
                  xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
@@@ -905,8 -899,8 +905,8 @@@
                  memset(dctblock, 0, sizeof(*dctblock) * 64);
                  dctblock[0] = binkb_get_value(c, BINKB_SRC_INTER_DC);
                  qp = binkb_get_value(c, BINKB_SRC_INTER_Q);
 -                read_dct_coeffs(gb, dctblock, bink_scan, binkb_inter_quant, qp);
 +                read_dct_coeffs(gb, dctblock, bink_scan, (const int32_t (*)[64])binkb_inter_quant, qp);
-                 c->bdsp.idct_add(dst, stride, dctblock);
+                 c->binkdsp.idct_add(dst, stride, dctblock);
                  break;
              case 5:
                  v = binkb_get_value(c, BINKB_SRC_COLORS);
@@@ -1308,12 -1312,9 +1308,12 @@@ static av_cold int decode_init(AVCodecC
  
      ff_dsputil_init(&c->dsp, avctx);
      ff_hpeldsp_init(&c->hdsp, avctx->flags);
-     ff_binkdsp_init(&c->bdsp);
+     ff_binkdsp_init(&c->binkdsp);
  
 -    init_bundles(c);
 +    if ((ret = init_bundles(c)) < 0) {
 +        free_bundles(c);
 +        return ret;
 +    }
  
      if (c->version == 'b') {
          if (!binkb_initialised) {