diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-22 01:52:09 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-26 06:15:30 +0300 |
commit | a009d56d4d9672e88660bc7e1d179bbbdfb7b35a (patch) | |
tree | 3852711d9077c630e9090b7eb0215cbd352aee81 /ffmpeg_files/x86_cpu.h | |
parent | 97bd0624df0e2f7acaca708258eb7627fabf6d02 (diff) | |
download | mpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.bz2 mpv-a009d56d4d9672e88660bc7e1d179bbbdfb7b35a.tar.xz |
Add copies of needed internal FFmpeg files under ffmpeg_files/
MPlayer used to depend on having an FFmpeg tree available at build
time to provide this code, and FFmpeg changes occasionally broke
the MPlayer build as a result. Some of the relevant functionality also
depends on FFmpeg library symbols that are not part of the FFmpeg API,
meaning that library changes could break MPlayer after the build. Add
a copy of the relevant functionality to the MPlayer tree and use that
instead.
The added files are:
- The headers bswap.h, intreadwrite.h and x86_cpu.h from libavutil.
Some MPlayer code uses the functionality defined as macros and
static inline functions in these headers.
- Architecture-specific internal files used by the above headers.
These are in the subdirectories: x86/, arm/, bfin/, sh4/.
- taglists.[ch], which provides the codec tables from
libavformat/riff.c and two functions to access them from
libavformat/utils.c.
Most of the headers are copied from FFmpeg revision 19452 with only
the include guard names changed. A "common.h" include in bswap.h was
changed to "libavutil/common.h" as it should use the installed header.
Taglists.c contains snippets from the relevant files with some
changes like renamed identifiers.
Diffstat (limited to 'ffmpeg_files/x86_cpu.h')
-rw-r--r-- | ffmpeg_files/x86_cpu.h | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/ffmpeg_files/x86_cpu.h b/ffmpeg_files/x86_cpu.h new file mode 100644 index 0000000000..49a5b28a35 --- /dev/null +++ b/ffmpeg_files/x86_cpu.h @@ -0,0 +1,76 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> + * + * 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 MP_AVUTIL_X86_CPU_H +#define MP_AVUTIL_X86_CPU_H + +#include <stdint.h> +#include "config.h" + +#if ARCH_X86_64 +# define REG_a "rax" +# define REG_b "rbx" +# define REG_c "rcx" +# define REG_d "rdx" +# define REG_D "rdi" +# define REG_S "rsi" +# define PTR_SIZE "8" +typedef int64_t x86_reg; + +# define REG_SP "rsp" +# define REG_BP "rbp" +# define REGBP rbp +# define REGa rax +# define REGb rbx +# define REGc rcx +# define REGd rdx +# define REGSP rsp + +#elif ARCH_X86_32 + +# define REG_a "eax" +# define REG_b "ebx" +# define REG_c "ecx" +# define REG_d "edx" +# define REG_D "edi" +# define REG_S "esi" +# define PTR_SIZE "4" +typedef int32_t x86_reg; + +# define REG_SP "esp" +# define REG_BP "ebp" +# define REGBP ebp +# define REGa eax +# define REGb ebx +# define REGc ecx +# define REGd edx +# define REGSP esp +#else +typedef int x86_reg; +#endif + +#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) +#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) + +#if ARCH_X86_64 && defined(PIC) +# define BROKEN_RELOCATIONS 1 +#endif + +#endif /* AVUTIL_X86_CPU_H */ |