01c5779f56
* commit '01c5779f56': x86: Drop some unnecessary YASM ifdefs Conflicts: libavfilter/x86/vf_yadif_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
0e73049416
ed1a11ed52
ee80cf741a