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 /libavcodec/x86/hpeldsp.asm | |
| parent | be879af217e8d399412db093a4879b9f798671fa (diff) | |
| parent | 831a1180785a786272cdcefb71566a770bfb879e (diff) | |
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 'libavcodec/x86/hpeldsp.asm')
| -rw-r--r-- | libavcodec/x86/hpeldsp.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm index 4eaba6eaca..687b4740ba 100644 --- a/libavcodec/x86/hpeldsp.asm +++ b/libavcodec/x86/hpeldsp.asm @@ -6,7 +6,7 @@ ;* Copyright (c) 2002 Zdenek Kabelac <kabi@informatics.muni.cz> ;* Copyright (c) 2013 Daniel Kang ;* -;* MMX optimized hpel functions +;* SIMD-optimized halfpel functions ;* ;* This file is part of FFmpeg. ;* |