Changeset ebb21887 in ffmpeg

Timestamp:

Apr 5, 2014, 5:16:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e3c3f27

Parents:

865c94bb (diff), 01c5779f (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 '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

• commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8': x86: Drop some unnecessary YASM ifdefs

Conflicts:

libavfilter/x86/vf_yadif_init.c

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

(No files)