[FFmpeg-cvslog] Merge commit '5e87080f2c73186066df0b9c43877b4af0beef3a'
Michael Niedermayer
git at videolan.org
Fri Jun 12 21:55:15 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 21:44:33 2015 +0200| [b68b5ec5136da66088b5a8f772c3775b79196eb4] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b68b5ec5136da66088b5a8f772c3775b79196eb4
---
More information about the ffmpeg-cvslog
mailing list