diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:44:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:47:01 +0200 |
| commit | b68b5ec5136da66088b5a8f772c3775b79196eb4 (patch) | |
| tree | 4b5aa492dffca09a5544e651ddf2e21eea8ad7b6 /libavcodec/dss_sp.c | |
| parent | 85d0df0c3090b99014d4e542a9476dcd8c52937d (diff) | |
| parent | 5e87080f2c73186066df0b9c43877b4af0beef3a (diff) | |
| download | ffmpeg-b68b5ec5136da66088b5a8f772c3775b79196eb4.tar.gz | |
Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'
* commit '5e87080f2c73186066df0b9c43877b4af0beef3a':
h264_weight: Fix SSSE3 biweight code with weights of 128
Conflicts:
libavcodec/x86/h264_weight.asm
See: e1009665759d4a3938dd2dd07b7e84d8bc9c5290
See: fb2288834ba8a51e8934cfe8b82ac468144a34df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dss_sp.c')
0 files changed, 0 insertions, 0 deletions