Changeset e98bac82 in ffmpeg

Timestamp:

Mar 20, 2014, 9:36:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4d216420

Parents:

011d83d (diff), 82bb3048 (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/20/14 21:26:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/20/14 21:36:40)

Message:

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

• commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer

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

(No files)