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/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 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/hpeldsp_arm.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/hpeldsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/hpeldsp_arm.S b/libavcodec/arm/hpeldsp_arm.S index 429c3ea020..219f793d99 100644 --- a/libavcodec/arm/hpeldsp_arm.S +++ b/libavcodec/arm/hpeldsp_arm.S @@ -1,5 +1,5 @@ @ -@ ARMv4 optimized DSP utils +@ ARMv4-optimized halfpel functions @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp> @ @ This file is part of FFmpeg. diff --git a/libavcodec/arm/hpeldsp_init_arm.c b/libavcodec/arm/hpeldsp_init_arm.c index 2cc2b782b2..0293ffe948 100644 --- a/libavcodec/arm/hpeldsp_init_arm.c +++ b/libavcodec/arm/hpeldsp_init_arm.c @@ -1,5 +1,5 @@ /* - * ARM optimized DSP utils + * ARM-optimized halfpel functions * Copyright (c) 2001 Lionel Ulmer * * This file is part of FFmpeg. diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S index 4bd365a332..55bcce5cb6 100644 --- a/libavcodec/arm/videodsp_armv5te.S +++ b/libavcodec/arm/videodsp_armv5te.S @@ -1,5 +1,5 @@ @ -@ ARMv5te optimized DSP utils +@ ARMv5te-optimized core video DSP functions @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp> @ @ This file is part of FFmpeg |