diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
| commit | c88503e3f6bd7881f147d340bf222a629daa55fc (patch) | |
| tree | b8feb316bc6924f9b648b7e57f6faa1dd6afe248 /libavutil/arm | |
| parent | 8740762c43dc92cfefa58769bb8cfade82aa695c (diff) | |
| parent | 439902e0d68a0f0d800c21b5e6b598d5fa0c51da (diff) | |
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Conflicts:
compat/aix/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 91c959ab27..b45f30b1a1 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -29,4 +29,4 @@ #define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) #define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) -#endif +#endif /* AVUTIL_ARM_CPU_H */ |