Changeset 5e5d8ac in ffmpeg

Timestamp:

Mar 14, 2014, 5:25:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2b94189e

Parents:

722b48bc (diff), 36b822b (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/14/14 17:24:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/14/14 17:25:04)

Message:

Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'

• commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9': arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

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

(No files)