diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-01-31 11:20:54 +0100 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-01-31 15:31:34 +0100 |
| commit | d0e132bab68073588dc55844a31b053fb0ee1c83 (patch) | |
| tree | 1c3b3cd8bee776019f2960cfca1d561019cb84d4 /libavcodec/mips | |
| parent | c778a9657dc8a425ac65f89d81d64709f2090a9f (diff) | |
| parent | 1bd890ad173d79e7906c5e1d06bf0a06cca4519d (diff) | |
| download | ffmpeg-d0e132bab68073588dc55844a31b053fb0ee1c83.tar.gz | |
Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'
* commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d':
hevc: Separate adding residual to prediction from IDCT
This commit should be a noop but isn't because of the following renames:
- transform_add → add_residual
- transform_skip → dequant
- idct_4x4_luma → transform_4x4_luma
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/mips')
| -rw-r--r-- | libavcodec/mips/hevcdsp_init_mips.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mips/hevcdsp_init_mips.c b/libavcodec/mips/hevcdsp_init_mips.c index 3675b93155..776d13e4d3 100644 --- a/libavcodec/mips/hevcdsp_init_mips.c +++ b/libavcodec/mips/hevcdsp_init_mips.c @@ -437,11 +437,11 @@ static av_cold void hevc_dsp_init_msa(HEVCDSPContext *c, c->idct_dc[1] = ff_hevc_idct_dc_8x8_msa; c->idct_dc[2] = ff_hevc_idct_dc_16x16_msa; c->idct_dc[3] = ff_hevc_idct_dc_32x32_msa; - c->transform_add[0] = ff_hevc_addblk_4x4_msa; - c->transform_add[1] = ff_hevc_addblk_8x8_msa; - c->transform_add[2] = ff_hevc_addblk_16x16_msa; - c->transform_add[3] = ff_hevc_addblk_32x32_msa; - c->idct_4x4_luma = ff_hevc_idct_luma_4x4_msa; + c->add_residual[0] = ff_hevc_addblk_4x4_msa; + c->add_residual[1] = ff_hevc_addblk_8x8_msa; + c->add_residual[2] = ff_hevc_addblk_16x16_msa; + c->add_residual[3] = ff_hevc_addblk_32x32_msa; + c->transform_4x4_luma = ff_hevc_idct_luma_4x4_msa; } } #endif // #if HAVE_MSA |