diff options
Diffstat (limited to 'libavutil/mips/intreadwrite.h')
| -rw-r--r-- | libavutil/mips/intreadwrite.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libavutil/mips/intreadwrite.h b/libavutil/mips/intreadwrite.h index 0db3da5666..32084f68f6 100644 --- a/libavutil/mips/intreadwrite.h +++ b/libavutil/mips/intreadwrite.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2009 Mans Rullgard <mans@mansr.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -24,13 +24,7 @@ #include <stdint.h> #include "config.h" -/* - * GCC actually handles unaligned accesses correctly in all cases - * except, absurdly, 32-bit loads on mips64. - * - * https://git.libav.org/?p=libav.git;a=commit;h=b82b49a5b774b6ad9119e981c72b8f594fee2ae0 - */ -#if HAVE_MIPS64R2_INLINE || HAVE_MIPS64R1_INLINE +#if ARCH_MIPS64 && HAVE_INLINE_ASM && !HAVE_MIPS64R6 #define AV_RN32 AV_RN32 static av_always_inline uint32_t AV_RN32(const void *p) @@ -47,6 +41,6 @@ static av_always_inline uint32_t AV_RN32(const void *p) return v; } -#endif /* HAVE_MIPS64R2_INLINE || HAVE_MIPS64R1_INLINE */ +#endif /* ARCH_MIPS64 && HAVE_INLINE_ASM && !HAVE_MIPS64R6 */ #endif /* AVUTIL_MIPS_INTREADWRITE_H */ |