diff options
| -rw-r--r-- | src/dxr3/dxr3_decoder.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/common.c | 2 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/bswap.h (renamed from src/libffmpeg/bswap.h) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c index e08088bc1..c27c60ef0 100644 --- a/src/dxr3/dxr3_decoder.c +++ b/src/dxr3/dxr3_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decoder.c,v 1.12 2001/08/16 12:54:58 ehasenle Exp $ + * $Id: dxr3_decoder.c,v 1.13 2001/08/17 13:34:25 heikos Exp $ * * dxr3 video and spu decoder plugin. Accepts the video and spu data * from XINE and sends it directly to the corresponding dxr3 devices. @@ -36,12 +36,12 @@ #include <fcntl.h> #include <errno.h> -#include <byteswap.h> #include <linux/soundcard.h> #include <linux/em8300.h> #include "video_out.h" #include "xine_internal.h" #include "buffer.h" +#include "xine-engine/bswap.h" #define LOOKUP_DEV "dxr3_devname" #define DEFAULT_DEV "/dev/em8300" diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 998146fe3..992b45aec 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -18,7 +18,7 @@ xineplug_decode_ff_la_LDFLAGS = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ -avoid-version -module -noinst_HEADERS = config.h bswap.h +noinst_HEADERS = config.h debug: @$(MAKE) CFLAGS="@DEBUG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H" diff --git a/src/libffmpeg/libavcodec/common.c b/src/libffmpeg/libavcodec/common.c index 24a9a1656..77b6d85d2 100644 --- a/src/libffmpeg/libavcodec/common.c +++ b/src/libffmpeg/libavcodec/common.c @@ -29,7 +29,7 @@ #define NDEBUG #include <assert.h> -#include "../bswap.h" +#include "xine-engine/bswap.h" void init_put_bits(PutBitContext *s, UINT8 *buffer, int buffer_size, diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 1900ae384..b2dc7b793 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.10 2001/08/16 12:33:00 ehasenle Exp $ + * $Id: xine_decoder.c,v 1.11 2001/08/17 13:34:25 heikos Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -35,13 +35,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <byteswap.h> #include "spu.h" #include "buffer.h" #include "events.h" #include "xine_internal.h" #include "video_out/alphablend.h" +#include "xine-engine/bswap.h" static clut_t __default_clut[] = { {y: 0x00, cr: 0x80, cb:0x80}, diff --git a/src/libffmpeg/bswap.h b/src/xine-engine/bswap.h index 21ef3a74e..21ef3a74e 100644 --- a/src/libffmpeg/bswap.h +++ b/src/xine-engine/bswap.h |