diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
| commit | e335658370840390272b70de92f5a76860537fb9 (patch) | |
| tree | 8f9074bfd2d0f5c6c09c34f23b354ee9dbce7e56 /libavutil/x86 | |
| parent | 43cce41267a7aa71946911e87b4dfce48183bb25 (diff) | |
| parent | 9734b8ba56d05e970c353dfd5baafa43fdb08024 (diff) | |
| download | ffmpeg-e335658370840390272b70de92f5a76860537fb9.tar.gz | |
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
Move avutil tables only used in libavcodec to libavcodec.
Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/intmath.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h deleted file mode 100644 index 4525a4dae5..0000000000 --- a/libavutil/x86/intmath.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2010 Mans Rullgard <mans@mansr.com> - * - * 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 - -#if HAVE_INLINE_ASM -#define FASTDIV(a,b) \ - ({\ - int ret, dmy;\ - __asm__ volatile(\ - "mull %3"\ - :"=d"(ret), "=a"(dmy)\ - :"1"((unsigned int)(a)), "rm"(ff_inverse[b])\ - );\ - ret;\ - }) -#endif - -#endif /* AVUTIL_X86_INTMATH_H */ |