diff options
| -rw-r--r-- | libavutil/intmath.h | 3 | ||||
| -rw-r--r-- | libavutil/x86/intmath.h | 38 |
2 files changed, 41 insertions, 0 deletions
diff --git a/libavutil/intmath.h b/libavutil/intmath.h index fa549c8a2d..f5ecc77b7d 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -29,6 +29,9 @@ #if ARCH_ARM # include "arm/intmath.h" #endif +#if ARCH_X86 +# include "x86/intmath.h" +#endif /** * @addtogroup lavu_internal diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h new file mode 100644 index 0000000000..7aa6bc42fb --- /dev/null +++ b/libavutil/x86/intmath.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2015 James Almer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_X86_INTMATH_H +#define AVUTIL_X86_INTMATH_H + +#include <stdint.h> +#include "config.h" + +/* Our generic version of av_popcount is faster than GCC's built-in on + * CPUs that don't support the popcnt instruction. + */ +#if defined(__GNUC__) && defined(__POPCNT__) + #define av_popcount __builtin_popcount +#if ARCH_X86_64 + #define av_popcount64 __builtin_popcountll +#endif + +#endif /* defined(__GNUC__) && defined(__POPCNT__) */ + +#endif /* AVUTIL_X86_INTMATH_H */ |