Changeset b68b5ec in ffmpeg

Timestamp:

Jun 12, 2015, 7:47:01 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

63b03562

Parents:

85d0df0c (diff), 5e87080f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:44:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:47:01)

Message:

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>

(No files)