Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 10:20:54 +0000 (11:20 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 14:31:34 +0000 (15:31 +0100)
commitd0e132bab68073588dc55844a31b053fb0ee1c83
tree1c3b3cd8bee776019f2960cfca1d561019cb84d4
parentc778a9657dc8a425ac65f89d81d64709f2090a9f
parent1bd890ad173d79e7906c5e1d06bf0a06cca4519d
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>
libavcodec/arm/hevcdsp_idct_neon.S
libavcodec/arm/hevcdsp_init_neon.c
libavcodec/hevc.c
libavcodec/hevc_cabac.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/hevcdsp_template.c
libavcodec/mips/hevcdsp_init_mips.c
libavcodec/x86/hevc_res_add.asm
libavcodec/x86/hevcdsp.h
libavcodec/x86/hevcdsp_init.c