aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 13:54:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 13:54:34 +0100
commitb1b870fbd7185bffbe27c5918001b40a8ff8b920 (patch)
treebcbe435fd95a2b06c8526617a2959fe0f6b8c637 /libavutil/version.h
parent205b2d2a9822e163cb24a2531d4b50e82e64eae4 (diff)
parent55aa03b9f8f11ebb7535424cc0e5635558590f49 (diff)
downloadffmpeg-b1b870fbd7185bffbe27c5918001b40a8ff8b920.tar.gz
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49': floatdsp: move vector_fmul_add from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
0 files changed, 0 insertions, 0 deletions