Changeset b7697d29 in ffmpeg

Timestamp:

Jan 6, 2014, 2:07:35 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4e276b84

Parents:

e86cd37a (diff), 2f970946 (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> (01/06/14 13:57:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 14:07:35)

Message:

Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

• commit '2f97094608cfd2665660f7a26a3291559b186752': lagarith: do not call simd functions on unaligned lines

Conflicts:

libavcodec/lagarith.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)