summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ffmpeg_files/arm/bswap.h72
-rw-r--r--ffmpeg_files/bfin/bswap.h45
-rw-r--r--ffmpeg_files/bswap.h103
-rw-r--r--ffmpeg_files/intreadwrite.h226
-rw-r--r--ffmpeg_files/sh4/bswap.h48
-rw-r--r--ffmpeg_files/x86/bswap.h61
-rw-r--r--libaf/af_lavcac3enc.c5
-rw-r--r--libmpcodecs/ad_dk3adpcm.c3
-rw-r--r--libmpcodecs/ad_hwac3.c5
-rw-r--r--libmpcodecs/ad_imaadpcm.c3
-rw-r--r--libmpcodecs/ad_msadpcm.c5
-rw-r--r--libmpcodecs/vd_ffmpeg.c2
-rw-r--r--libmpcodecs/vd_mtga.c3
-rw-r--r--libmpcodecs/vd_realvid.c3
-rw-r--r--libmpcodecs/vd_sgi.c3
-rw-r--r--libmpcodecs/vd_theora.c3
-rw-r--r--libmpdemux/asfheader.c5
-rw-r--r--libmpdemux/demux_asf.c3
-rw-r--r--libmpdemux/demux_audio.c11
-rw-r--r--libmpdemux/demux_mkv.c22
-rw-r--r--libmpdemux/demux_mov.c21
-rw-r--r--libmpdemux/demux_ogg.c3
-rw-r--r--libmpdemux/demux_real.c5
-rw-r--r--libmpdemux/demux_ty.c5
-rw-r--r--libmpdemux/demux_vqf.c5
-rw-r--r--libvo/vo_sdl.c2
-rw-r--r--mpbswap.h14
-rw-r--r--mplayer.c5
-rw-r--r--stream/asf_streaming.c4
-rw-r--r--stream/pnm.c8
-rw-r--r--stream/realrtsp/real.c14
-rw-r--r--stream/realrtsp/rmff.c3
-rw-r--r--stream/stream.c6
-rw-r--r--stream/stream_dvd_common.c7
-rw-r--r--stream/vcd_read.h4
-rw-r--r--stream/vcd_read_fbsd.h4
-rw-r--r--sub/spudec.c14
37 files changed, 113 insertions, 642 deletions
diff --git a/ffmpeg_files/arm/bswap.h b/ffmpeg_files/arm/bswap.h
deleted file mode 100644
index 98147449b1..0000000000
--- a/ffmpeg_files/arm/bswap.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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_ARM_BSWAP_H
-#define MP_AVUTIL_ARM_BSWAP_H
-
-#include <stdint.h>
-#include "config.h"
-#include "libavutil/common.h"
-
-#ifdef __ARMCC_VERSION
-
-#if HAVE_ARMV6
-#define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
-{
- __asm { rev16 x, x }
- return x;
-}
-
-#define bswap_32 bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
- return __rev(x);
-}
-#endif /* HAVE_ARMV6 */
-
-#elif HAVE_INLINE_ASM
-
-#if HAVE_ARMV6
-#define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
-{
- __asm__("rev16 %0, %0" : "+r"(x));
- return x;
-}
-#endif
-
-#define bswap_32 bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
-#if HAVE_ARMV6
- __asm__("rev %0, %0" : "+r"(x));
-#else
- uint32_t t;
- __asm__ ("eor %1, %0, %0, ror #16 \n\t"
- "bic %1, %1, #0xFF0000 \n\t"
- "mov %0, %0, ror #8 \n\t"
- "eor %0, %0, %1, lsr #8 \n\t"
- : "+r"(x), "=&r"(t));
-#endif /* HAVE_ARMV6 */
- return x;
-}
-
-#endif /* __ARMCC_VERSION */
-
-#endif /* AVUTIL_ARM_BSWAP_H */
diff --git a/ffmpeg_files/bfin/bswap.h b/ffmpeg_files/bfin/bswap.h
deleted file mode 100644
index 0f7e5a26eb..0000000000
--- a/ffmpeg_files/bfin/bswap.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007 Marc Hoffman
- *
- * 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
- */
-
-/**
- * @file libavutil/bfin/bswap.h
- * byte swapping routines
- */
-
-#ifndef MP_AVUTIL_BFIN_BSWAP_H
-#define MP_AVUTIL_BFIN_BSWAP_H
-
-#include <stdint.h>
-#include "config.h"
-#include "libavutil/common.h"
-
-#define bswap_32 bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
- unsigned tmp;
- __asm__("%1 = %0 >> 8 (V); \n\t"
- "%0 = %0 << 8 (V); \n\t"
- "%0 = %0 | %1; \n\t"
- "%0 = PACK(%0.L, %0.H); \n\t"
- : "+d"(x), "=&d"(tmp));
- return x;
-}
-
-#endif /* AVUTIL_BFIN_BSWAP_H */
diff --git a/ffmpeg_files/bswap.h b/ffmpeg_files/bswap.h
deleted file mode 100644
index 3bfa6aa631..0000000000
--- a/ffmpeg_files/bswap.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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
- */
-
-
-// This file in MPlayer is otherwise the same as in FFmpeg, except it
-// includes "libavutil/common.h" instead of "common.h".
-
-/**
- * @file libavutil/bswap.h
- * byte swapping routines
- */
-
-#ifndef MP_AVUTIL_BSWAP_H
-#define MP_AVUTIL_BSWAP_H
-
-#include <stdint.h>
-#include "libavutil/common.h"
-#include "config.h"
-
-#if ARCH_ARM
-# include "arm/bswap.h"
-#elif ARCH_BFIN
-# include "bfin/bswap.h"
-#elif ARCH_SH4
-# include "sh4/bswap.h"
-#elif ARCH_X86
-# include "x86/bswap.h"
-#endif
-
-#ifndef bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
-{
- x= (x>>8) | (x<<8);
- return x;
-}
-#endif
-
-#ifndef bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
- x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
- x= (x>>16) | (x<<16);
- return x;
-}
-#endif
-
-#ifndef bswap_64
-static inline uint64_t av_const bswap_64(uint64_t x)
-{
-#if 0
- x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
- x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
- return (x>>32) | (x<<32);
-#else
- union {
- uint64_t ll;
- uint32_t l[2];
- } w, r;
- w.ll = x;
- r.l[0] = bswap_32 (w.l[1]);
- r.l[1] = bswap_32 (w.l[0]);
- return r.ll;
-#endif
-}
-#endif
-
-// be2me ... big-endian to machine-endian
-// le2me ... little-endian to machine-endian
-
-#ifdef WORDS_BIGENDIAN
-#define be2me_16(x) (x)
-#define be2me_32(x) (x)
-#define be2me_64(x) (x)
-#define le2me_16(x) bswap_16(x)
-#define le2me_32(x) bswap_32(x)
-#define le2me_64(x) bswap_64(x)
-#else
-#define be2me_16(x) bswap_16(x)
-#define be2me_32(x) bswap_32(x)
-#define be2me_64(x) bswap_64(x)
-#define le2me_16(x) (x)
-#define le2me_32(x) (x)
-#define le2me_64(x) (x)
-#endif
-
-#endif /* AVUTIL_BSWAP_H */
diff --git a/ffmpeg_files/intreadwrite.h b/ffmpeg_files/intreadwrite.h
deleted file mode 100644
index 73eaa1badf..0000000000
--- a/ffmpeg_files/intreadwrite.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * 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_INTREADWRITE_H
-#define MP_AVUTIL_INTREADWRITE_H
-
-#include <stdint.h>
-#include "config.h"
-#include "bswap.h"
-
-#ifndef AV_RB16
-#define AV_RB16(x) ((((const uint8_t*)(x))[0] << 8) | \
- ((const uint8_t*)(x))[1])
-#endif
-#ifndef AV_WB16
-#define AV_WB16(p, d) do { \
- ((uint8_t*)(p))[1] = (d); \
- ((uint8_t*)(p))[0] = (d)>>8; } while(0)
-#endif
-
-#ifndef AV_RL16
-#define AV_RL16(x) ((((const uint8_t*)(x))[1] << 8) | \
- ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL16
-#define AV_WL16(p, d) do { \
- ((uint8_t*)(p))[0] = (d); \
- ((uint8_t*)(p))[1] = (d)>>8; } while(0)
-#endif
-
-#ifndef AV_RB32
-#define AV_RB32(x) (((uint32_t)((const uint8_t*)(x))[0] << 24) | \
- (((const uint8_t*)(x))[1] << 16) | \
- (((const uint8_t*)(x))[2] << 8) | \
- ((const uint8_t*)(x))[3])
-#endif
-#ifndef AV_WB32
-#define AV_WB32(p, d) do { \
- ((uint8_t*)(p))[3] = (d); \
- ((uint8_t*)(p))[2] = (d)>>8; \
- ((uint8_t*)(p))[1] = (d)>>16; \
- ((uint8_t*)(p))[0] = (d)>>24; } while(0)
-#endif
-
-#ifndef AV_RL32
-#define AV_RL32(x) (((uint32_t)((const uint8_t*)(x))[3] << 24) | \
- (((const uint8_t*)(x))[2] << 16) | \
- (((const uint8_t*)(x))[1] << 8) | \
- ((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL32
-#define AV_WL32(p, d) do { \
- ((uint8_t*)(p))[0] = (d); \
- ((uint8_t*)(p))[1] = (d)>>8; \
- ((uint8_t*)(p))[2] = (d)>>16; \
- ((uint8_t*)(p))[3] = (d)>>24; } while(0)
-#endif
-
-#ifndef AV_RB64
-#define AV_RB64(x) (((uint64_t)((const uint8_t*)(x))[0] << 56) | \
- ((uint64_t)((const uint8_t*)(x))[1] << 48) | \
- ((uint64_t)((const uint8_t*)(x))[2] << 40) | \
- ((uint64_t)((const uint8_t*)(x))[3] << 32) | \
- ((uint64_t)((const uint8_t*)(x))[4] << 24) | \
- ((uint64_t)((const uint8_t*)(x))[5] << 16) | \
- ((uint64_t)((const uint8_t*)(x))[6] << 8) | \
- (uint64_t)((const uint8_t*)(x))[7])
-#endif
-#ifndef AV_WB64
-#define AV_WB64(p, d) do { \
- ((uint8_t*)(p))[7] = (d); \
- ((uint8_t*)(p))[6] = (d)>>8; \
- ((uint8_t*)(p))[5] = (d)>>16; \
- ((uint8_t*)(p))[4] = (d)>>24; \
- ((uint8_t*)(p))[3] = (d)>>32; \
- ((uint8_t*)(p))[2] = (d)>>40; \
- ((uint8_t*)(p))[1] = (d)>>48; \
- ((uint8_t*)(p))[0] = (d)>>56; } while(0)
-#endif
-
-#ifndef AV_RL64
-#define AV_RL64(x) (((uint64_t)((const uint8_t*)(x))[7] << 56) | \
- ((uint64_t)((const uint8_t*)(x))[6] << 48) | \
- ((uint64_t)((const uint8_t*)(x))[5] << 40) | \
- ((uint64_t)((const uint8_t*)(x))[4] << 32) | \
- ((uint64_t)((const uint8_t*)(x))[3] << 24) | \
- ((uint64_t)((const uint8_t*)(x))[2] << 16) | \
- ((uint64_t)((const uint8_t*)(x))[1] << 8) | \
- (uint64_t)((const uint8_t*)(x))[0])
-#endif
-#ifndef AV_WL64
-#define AV_WL64(p, d) do { \
- ((uint8_t*)(p))[0] = (d); \
- ((uint8_t*)(p))[1] = (d)>>8; \
- ((uint8_t*)(p))[2] = (d)>>16; \
- ((uint8_t*)(p))[3] = (d)>>24; \
- ((uint8_t*)(p))[4] = (d)>>32; \
- ((uint8_t*)(p))[5] = (d)>>40; \
- ((uint8_t*)(p))[6] = (d)>>48; \
- ((uint8_t*)(p))[7] = (d)>>56; } while(0)
-#endif
-
-#ifdef WORDS_BIGENDIAN
-# define AV_RN(s, p) AV_RB##s(p)
-# define AV_WN(s, p, v) AV_WB##s(p, v)
-#else
-# define AV_RN(s, p) AV_RL##s(p)
-# define AV_WN(s, p, v) AV_WL##s(p, v)
-#endif
-
-#ifndef AV_RN16
-# define AV_RN16(p) AV_RN(16, p)
-#endif
-
-#ifndef AV_RN32
-# define AV_RN32(p) AV_RN(32, p)
-#endif
-
-#ifndef AV_RN64
-# define AV_RN64(p) AV_RN(64, p)
-#endif
-
-#ifndef AV_WN16
-# define AV_WN16(p, v) AV_WN(16, p, v)
-#endif
-
-#ifndef AV_WN32
-# define AV_WN32(p, v) AV_WN(32, p, v)
-#endif
-
-#ifndef AV_WN64
-# define AV_WN64(p, v) AV_WN(64, p, v)
-#endif
-
-#ifdef WORDS_BIGENDIAN
-# define AV_RB(s, p) AV_RN(s, p)
-# define AV_WB(s, p, v) AV_WN(s, p, v)
-# define AV_RL(s, p) bswap_##s(AV_RN(s, p))
-# define AV_WL(s, p, v) AV_WN(s, p, bswap_##s(v))
-#else
-# define AV_RB(s, p) bswap_##s(AV_RN(s, p))
-# define AV_WB(s, p, v) AV_WN(s, p, bswap_##s(v))
-# define AV_RL(s, p) AV_RN(s, p)
-# define AV_WL(s, p, v) AV_WN(s, p, v)
-#endif
-
-#define AV_RB8(x) (((const uint8_t*)(x))[0])
-#define AV_WB8(p, d) do { ((uint8_t*)(p))[0] = (d); } while(0)
-
-#define AV_RL8(x) AV_RB8(x)
-#define AV_WL8(p, d) AV_WB8(p, d)
-
-#ifndef AV_RB16
-# define AV_RB16(p) AV_RB(16, p)
-#endif
-#ifndef AV_WB16
-# define AV_WB16(p, v) AV_WB(16, p, v)
-#endif
-
-#ifndef AV_RL16
-# define AV_RL16(p) AV_RL(16, p)
-#endif
-#ifndef AV_WL16
-# define AV_WL16(p, v) AV_WL(16, p, v)
-#endif
-
-#ifndef AV_RB32
-# define AV_RB32(p) AV_RB(32, p)
-#endif
-#ifndef AV_WB32
-# define AV_WB32(p, v) AV_WB(32, p, v)
-#endif
-
-#ifndef AV_RL32
-# define AV_RL32(p) AV_RL(32, p)
-#endif
-#ifndef AV_WL32
-# define AV_WL32(p, v) AV_WL(32, p, v)
-#endif
-
-#ifndef AV_RB64
-# define AV_RB64(p) AV_RB(64, p)
-#endif
-#ifndef AV_WB64
-# define AV_WB64(p, v) AV_WB(64, p, v)
-#endif
-
-#ifndef AV_RL64
-# define AV_RL64(p) AV_RL(64, p)
-#endif
-#ifndef AV_WL64
-# define AV_WL64(p, v) AV_WL(64, p, v)
-#endif
-
-#define AV_RB24(x) ((((const uint8_t*)(x))[0] << 16) | \
- (((const uint8_t*)(x))[1] << 8) | \
- ((const uint8_t*)(x))[2])
-#define AV_WB24(p, d) do { \
- ((uint8_t*)(p))[2] = (d); \
- ((uint8_t*)(p))[1] = (d)>>8; \
- ((uint8_t*)(p))[0] = (d)>>16; } while(0)
-
-#define AV_RL24(x) ((((const uint8_t*)(x))[2] << 16) | \
- (((const uint8_t*)(x))[1] << 8) | \
- ((const uint8_t*)(x))[0])
-#define AV_WL24(p, d) do { \
- ((uint8_t*)(p))[0] = (d); \
- ((uint8_t*)(p))[1] = (d)>>8; \
- ((uint8_t*)(p))[2] = (d)>>16; } while(0)
-
-#endif /* AVUTIL_INTREADWRITE_H */
diff --git a/ffmpeg_files/sh4/bswap.h b/ffmpeg_files/sh4/bswap.h
deleted file mode 100644
index 47b91397ea..0000000000
--- a/ffmpeg_files/sh4/bswap.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file libavutil/sh4/bswap.h
- * byte swapping routines
- */
-
-#ifndef MP_AVUTIL_SH4_BSWAP_H
-#define MP_AVUTIL_SH4_BSWAP_H
-
-#include <stdint.h>
-#include "config.h"
-#include "libavutil/common.h"
-
-#define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
-{
- __asm__("swap.b %0,%0" : "+r"(x));
- return x;
-}
-
-#define bswap_32 bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
- __asm__("swap.b %0,%0\n"
- "swap.w %0,%0\n"
- "swap.b %0,%0\n"
- : "+r"(x));
- return x;
-}
-
-#endif /* AVUTIL_SH4_BSWAP_H */
diff --git a/ffmpeg_files/x86/bswap.h b/ffmpeg_files/x86/bswap.h
deleted file mode 100644
index 62238d178a..0000000000
--- a/ffmpeg_files/x86/bswap.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file libavutil/x86/bswap.h
- * byte swapping routines
- */
-
-#ifndef MP_AVUTIL_X86_BSWAP_H
-#define MP_AVUTIL_X86_BSWAP_H
-
-#include <stdint.h>
-#include "config.h"
-#include "libavutil/common.h"
-
-#define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
-{
- __asm__("rorw $8, %0" : "+r"(x));
- return x;
-}
-
-#define bswap_32 bswap_32
-static av_always_inline av_const uint32_t bswap_32(uint32_t x)
-{
-#if HAVE_BSWAP
- __asm__("bswap %0" : "+r" (x));
-#else
- __asm__("rorw $8, %w0 \n\t"
- "rorl $16, %0 \n\t"
- "rorw $8, %w0"
- : "+r"(x));
-#endif
- return x;
-}
-
-#if ARCH_X86_64
-#define bswap_64 bswap_64
-static inline uint64_t av_const bswap_64(uint64_t x)
-{
- __asm__("bswap %0": "=r" (x) : "0" (x));
- return x;
-}
-#endif
-
-#endif /* AVUTIL_X86_BSWAP_H */
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c
index ebb1c6ebea..8cc9884f60 100644
--- a/libaf/af_lavcac3enc.c
+++ b/libaf/af_lavcac3enc.c
@@ -26,12 +26,13 @@
#include <inttypes.h>
#include <assert.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#include "af.h"
#include "reorder_ch.h"
-#include "libavcodec/avcodec.h"
-#include "ffmpeg_files/intreadwrite.h"
#define AC3_MAX_CHANNELS 6
#define AC3_MAX_CODED_FRAME_SIZE 3840
diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c
index d1792ee46b..15027f88b1 100644
--- a/libmpcodecs/ad_dk3adpcm.c
+++ b/libmpcodecs/ad_dk3adpcm.c
@@ -32,8 +32,9 @@
#include <stdlib.h>
#include <unistd.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "ad_internal.h"
static const ad_info_t info =
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c
index f5d6fbc933..a11c2c90e7 100644
--- a/libmpcodecs/ad_hwac3.c
+++ b/libmpcodecs/ad_hwac3.c
@@ -26,11 +26,12 @@
#include <string.h>
#include <unistd.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
#include "config.h"
#include "mp_msg.h"
#include "mpbswap.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "ad_internal.h"
diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c
index 2ca71f29de..84f667ecd6 100644
--- a/libmpcodecs/ad_imaadpcm.c
+++ b/libmpcodecs/ad_imaadpcm.c
@@ -38,8 +38,9 @@
#include <unistd.h>
#include <inttypes.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "mpbswap.h"
#include "ad_internal.h"
diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c
index 162c7c04d3..eee89de2ea 100644
--- a/libmpcodecs/ad_msadpcm.c
+++ b/libmpcodecs/ad_msadpcm.c
@@ -28,9 +28,10 @@
#include <stdlib.h>
#include <unistd.h>
+#include <libavutil/common.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "mpbswap.h"
#include "ad_internal.h"
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index cd59b05e79..f407302d77 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -24,6 +24,7 @@
#include <libavutil/common.h>
#include <libavutil/opt.h>
+#include <libavutil/intreadwrite.h>
#include "talloc.h"
#include "config.h"
@@ -31,7 +32,6 @@
#include "options.h"
#include "av_opts.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "mpbswap.h"
#include "fmt-conversion.h"
diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c
index 390166a3e6..861f898f80 100644
--- a/libmpcodecs/vd_mtga.c
+++ b/libmpcodecs/vd_mtga.c
@@ -26,10 +26,11 @@
#include <stdlib.h>
#include <string.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#include "mp_msg.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index 8fc843855f..08637b1407 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -19,6 +19,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#ifdef HAVE_LIBDL
@@ -26,7 +28,6 @@
#endif
#include "mp_msg.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "path.h"
#include "vd_internal.h"
diff --git a/libmpcodecs/vd_sgi.c b/libmpcodecs/vd_sgi.c
index e7dd90cecc..1ec9b2e868 100644
--- a/libmpcodecs/vd_sgi.c
+++ b/libmpcodecs/vd_sgi.c
@@ -21,9 +21,10 @@
#include <stdio.h>
#include <stdlib.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#include "mp_msg.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "mpbswap.h"
#include "vd_internal.h"
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c
index 5ad3b35691..ba3c0d5d86 100644
--- a/libmpcodecs/vd_theora.c
+++ b/libmpcodecs/vd_theora.c
@@ -21,12 +21,13 @@
#include <stdarg.h>
#include <assert.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#include "mp_msg.h"
#include "vd_internal.h"
-#include "ffmpeg_files/intreadwrite.h"
static const vd_info_t info = {
"Theora/VP3",
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 857a899bef..bd775b7660 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -22,9 +22,10 @@
#include <stdlib.h>
#include <unistd.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/common.h>
+
#include "config.h"
-#include "libavutil/common.h"
-#include "ffmpeg_files/intreadwrite.h"
#include "mp_msg.h"
#include "stream/stream.h"
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index c10fd3e14b..eb71d4ef96 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -24,6 +24,8 @@
#include <unistd.h>
#include <limits.h>
+#include <libavutil/intreadwrite.h>
+
#include "config.h"
#include "mp_msg.h"
@@ -33,7 +35,6 @@
#include "demuxer.h"
#include "libmpcodecs/dec_audio.h"
#include "libvo/fastmemcpy.h"
-#include "ffmpeg_files/intreadwrite.h"
// based on asf file-format doc by Eugene [http://divx.euro