aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:04:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:04:50 +0100
commit6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (patch)
tree5e04d38f8e152faf98921843ca5e4530cbdc46a4 /libavutil/version.h
parentb1b870fbd7185bffbe27c5918001b40a8ff8b920 (diff)
parent42d324694883cdf1fff1612ac70fa403692a1ad4 (diff)
downloadffmpeg-6e6e1708984e45881b9a5d4e26c3e7de852c54d5.tar.gz
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4': floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp. Conflicts: libavcodec/arm/dsputil_init_vfp.c libavcodec/arm/dsputil_vfp.S libavcodec/dsputil.c libavcodec/ppc/float_altivec.c libavcodec/x86/dsputil.asm libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
0 files changed, 0 insertions, 0 deletions