aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/alpha/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-15 02:28:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-15 02:39:49 +0100
commit6f373d75e8923ceb0c6b248b55f65f06dcf69101 (patch)
tree6b05292005d71a7f9bb41c965ff76794753cfd81 /libavcodec/alpha/Makefile
parent53ab7846eeb6cf91bd33dc17598bd5a66b8e3497 (diff)
parent2e1704059ae8625beda2ffde847ad22c5ba416dc (diff)
downloadffmpeg-6f373d75e8923ceb0c6b248b55f65f06dcf69101.tar.gz
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc': vf_interlace: Add SIMD for lowpass filter Conflicts: libavfilter/vf_interlace.c libavfilter/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha/Makefile')
0 files changed, 0 insertions, 0 deletions