summaryrefslogtreecommitdiff
path: root/libavcodec/x86/fpel.asm
Commit message (Collapse)AuthorAge
* Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'Michael Niedermayer2013-04-20
| | | | | | | | | | | | | | | * commit '8db00081a37d5b7e23918ee500bb16bc59b57197': x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.c libavcodec/hpeldsp.h libavcodec/x86/Makefile libavcodec/x86/dsputil_mmx.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/hpeldsp_rnd_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* x86: hpeldsp: Move half-pel assembly from dsputil to hpeldspRonald S. Bultje2013-04-19
Signed-off-by: Martin Storsjö <martin@martin.st>