diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
| commit | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (patch) | |
| tree | a72ecac476a799f37c63fe704758f61044a999e8 /libavcodec/bink.c | |
| parent | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (diff) | |
| parent | cb52a17cb62297802b0a77e5af9850d87c3f925b (diff) | |
| download | ffmpeg-d35899ccce39e77a3f7fb667bdfc710c605d03a4.tar.gz | |
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bink.c')
| -rw-r--r-- | libavcodec/bink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index f23542f17e..a28b6f0254 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -889,7 +889,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->dsp.add_pixels8(dst, block, stride); + c->bdsp.add_pixels8(dst, block, stride); break; case 4: xoff = binkb_get_value(c, BINKB_SRC_X_OFF); @@ -1126,7 +1126,7 @@ 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->dsp.add_pixels8(dst, block, stride); + c->bdsp.add_pixels8(dst, block, stride); break; case INTRA_BLOCK: memset(dctblock, 0, sizeof(*dctblock) * 64); |