Changeset 1ea28ffc in ffmpeg

Timestamp:

Oct 24, 2013, 8:35:39 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

caac12bd

Parents:

04916953 (diff), 0e73049 (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> (10/24/13 08:32:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/24/13 08:35:39)

Message:

Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

• commit '0e730494160d973400aed8d2addd1f58a0ec883e': avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:

libavfilter/x86/vf_gradfun_init.c

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

(No files)