diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 23:59:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 23:59:56 +0100 |
| commit | 1c788eaca9a0ad398d1b6ecc3797949ca84b42f9 (patch) | |
| tree | 21283369abd6485bc016e4c0b5222e77507d20c4 /libavutil/arm | |
| parent | be879af217e8d399412db093a4879b9f798671fa (diff) | |
| parent | 831a1180785a786272cdcefb71566a770bfb879e (diff) | |
| download | ffmpeg-1c788eaca9a0ad398d1b6ecc3797949ca84b42f9.tar.gz | |
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
* commit '831a1180785a786272cdcefb71566a770bfb879e':
Update dsputil- and SIMD-related comments to match reality more closely
Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/float_dsp_init_arm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index 38148b3878..678762862e 100644 --- a/libavutil/arm/float_dsp_init_arm.c +++ b/libavutil/arm/float_dsp_init_arm.c @@ -1,6 +1,4 @@ /* - * ARM optimized DSP utils - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or |