diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:19:25 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:20:48 +0400 |
| commit | 706f81a2c27552fdc9d216834eedd36f5804c080 (patch) | |
| tree | 46931fd1a7d52b2d6c815adc2a24dec1429893b3 /libavcodec/hevcdsp.h | |
| parent | 226b290f9f73d691ef1423d5c105f0bb0577d588 (diff) | |
| parent | 1a880b2fb8456ce68eefe5902bac95fea1e6a72d (diff) | |
Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'
* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
hevc: SSE2 and SSSE3 loop filters
Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c
See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcdsp.h')
| -rw-r--r-- | libavcodec/hevcdsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h index 03d4246ca0..c18bc865e9 100644 --- a/libavcodec/hevcdsp.h +++ b/libavcodec/hevcdsp.h @@ -123,6 +123,6 @@ void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth); extern const int8_t ff_hevc_epel_filters[7][4]; extern const int8_t ff_hevc_qpel_filters[3][16]; -void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth); +void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth); #endif /* AVCODEC_HEVCDSP_H */ |