Changeset e3c3f27 in ffmpeg

Timestamp:

Apr 5, 2014, 5:30:44 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e6f69b3

Parents:

ebb21887 (diff), c2c5be57 (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> (04/05/14 17:30:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/05/14 17:30:44)

Message:

Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

• commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99': x86: h264_qpel: Simplify an #if conditional

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

(No files)