diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 00:19:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 00:20:48 +0200 |
| commit | 706f81a2c27552fdc9d216834eedd36f5804c080 (patch) | |
| tree | 46931fd1a7d52b2d6c815adc2a24dec1429893b3 /libavcodec/hevcdsp.c | |
| parent | 226b290f9f73d691ef1423d5c105f0bb0577d588 (diff) | |
| parent | 1a880b2fb8456ce68eefe5902bac95fea1e6a72d (diff) | |
| download | ffmpeg-streaming-706f81a2c27552fdc9d216834eedd36f5804c080.zip ffmpeg-streaming-706f81a2c27552fdc9d216834eedd36f5804c080.tar.gz | |
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.c')
| -rw-r--r-- | libavcodec/hevcdsp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c index 218c48f..3eae541 100644 --- a/libavcodec/hevcdsp.c +++ b/libavcodec/hevcdsp.c @@ -247,5 +247,7 @@ int i = 0; HEVC_DSP(8); break; } - if (ARCH_X86) ff_hevcdsp_init_x86(hevcdsp, bit_depth); + + if (ARCH_X86) + ff_hevc_dsp_init_x86(hevcdsp, bit_depth); } |
