diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-13 16:32:41 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-02 03:41:56 -0700 |
| commit | b88cc5cca111132b42c2ee99662bfefe7652e3da (patch) | |
| tree | 1c305659a5b637a8175d98a9350e4db4f1fe5727 | |
| parent | 59cb5747ec3c5cd842b94e574c37889521c97cc4 (diff) | |
| download | ffmpeg-b88cc5cca111132b42c2ee99662bfefe7652e3da.tar.gz | |
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
| -rw-r--r-- | libavcodec/bink.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index e1312a86d2..d1e94d98a8 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -115,7 +115,7 @@ typedef struct BinkContext { AVCodecContext *avctx; DSPContext dsp; HpelDSPContext hdsp; - BinkDSPContext bdsp; + BinkDSPContext binkdsp; AVFrame *last; int version; ///< internal Bink file version int has_alpha; @@ -867,7 +867,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, 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); - 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); @@ -883,7 +883,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, c->dsp.clear_block(block); v = binkb_get_value(c, BINKB_SRC_INTER_COEFS); read_residue(gb, block, v); - c->bdsp.add_pixels8(dst, block, stride); + c->binkdsp.add_pixels8(dst, block, stride); break; case 4: xoff = binkb_get_value(c, BINKB_SRC_X_OFF); @@ -900,7 +900,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, 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); - 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); @@ -1043,7 +1043,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTRA_DC); read_dct_coeffs(gb, dctblock, bink_scan, bink_intra_quant, -1); - c->bdsp.idct_put(ublock, 8, dctblock); + c->binkdsp.idct_put(ublock, 8, dctblock); break; case FILL_BLOCK: v = get_value(c, BINK_SRC_COLORS); @@ -1068,7 +1068,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, return AVERROR_INVALIDDATA; } if (blk != FILL_BLOCK) - c->bdsp.scale_block(ublock, dst, stride); + c->binkdsp.scale_block(ublock, dst, stride); bx++; dst += 8; prev += 8; @@ -1120,13 +1120,13 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, c->dsp.clear_block(block); v = get_bits(gb, 7); read_residue(gb, block, v); - c->bdsp.add_pixels8(dst, block, stride); + c->binkdsp.add_pixels8(dst, block, stride); break; case INTRA_BLOCK: memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTRA_DC); read_dct_coeffs(gb, dctblock, bink_scan, bink_intra_quant, -1); - c->bdsp.idct_put(dst, stride, dctblock); + c->binkdsp.idct_put(dst, stride, dctblock); break; case FILL_BLOCK: v = get_value(c, BINK_SRC_COLORS); @@ -1140,7 +1140,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTER_DC); read_dct_coeffs(gb, dctblock, bink_scan, bink_inter_quant, -1); - c->bdsp.idct_add(dst, stride, dctblock); + c->binkdsp.idct_add(dst, stride, dctblock); break; case PATTERN_BLOCK: for (i = 0; i < 2; i++) @@ -1312,7 +1312,7 @@ static av_cold int decode_init(AVCodecContext *avctx) 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); |