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/hevcdsp.c | |
| 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/hevcdsp.c')
| -rw-r--r-- | libavcodec/hevcdsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c index 9d773d960e..23e923f8e5 100644 --- a/libavcodec/hevcdsp.c +++ b/libavcodec/hevcdsp.c @@ -195,13 +195,13 @@ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) #define HEVC_DSP(depth) \ hevcdsp->put_pcm = FUNC(put_pcm, depth); \ - hevcdsp->transform_add[0] = FUNC(transform_add4x4, depth); \ - hevcdsp->transform_add[1] = FUNC(transform_add8x8, depth); \ - hevcdsp->transform_add[2] = FUNC(transform_add16x16, depth); \ - hevcdsp->transform_add[3] = FUNC(transform_add32x32, depth); \ - hevcdsp->transform_skip = FUNC(transform_skip, depth); \ + hevcdsp->add_residual[0] = FUNC(add_residual4x4, depth); \ + hevcdsp->add_residual[1] = FUNC(add_residual8x8, depth); \ + hevcdsp->add_residual[2] = FUNC(add_residual16x16, depth); \ + hevcdsp->add_residual[3] = FUNC(add_residual32x32, depth); \ + hevcdsp->dequant = FUNC(dequant, depth); \ hevcdsp->transform_rdpcm = FUNC(transform_rdpcm, depth); \ - hevcdsp->idct_4x4_luma = FUNC(transform_4x4_luma, depth); \ + hevcdsp->transform_4x4_luma = FUNC(transform_4x4_luma, depth); \ hevcdsp->idct[0] = FUNC(idct_4x4, depth); \ hevcdsp->idct[1] = FUNC(idct_8x8, depth); \ hevcdsp->idct[2] = FUNC(idct_16x16, depth); \ |