Changeset 8fbc6e59 in ffmpeg

Timestamp:

Mar 22, 2014, 9:11:27 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d6d3cfb0

Parents:

32da2fd4 (diff), 1a8d0cf7 (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> (03/22/14 21:11:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/22/14 21:11:27)

Message:

Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

• commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd': x86: dsputil: Move inline assembly macros to a separate header

Conflicts:

libavcodec/x86/dsputil_mmx.c

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

(No files)