Changeset d926c4b2 in ffmpeg

Timestamp:

Mar 14, 2014, 12:01:37 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b7a5f5dc

Parents:

55f53f6 (diff), 38675229 (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.

Message:

Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'

• commit '38675229a879aa5258a8c71891fc8cbf74cf139f': dsputil_mmx: K&R formatting cosmetics

Conflicts:

libavcodec/x86/dsputil_mmx.c

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

(No files)