From 2c42495cf094512b2fde1e69370b68a8df0d4e32 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Sun, 17 Sep 2000 12:31:01 +0000
Subject: [PATCH] Converted the mpeg2 encoder asm to gnu asm, removing the
 dependency of nasm

Original commit message from CVS:
Converted the mpeg2 encoder asm to gnu asm, removing the dependency of nasm
Added cpu detection in the mpeg2 encoder
removed the inlined mmx asembler to seperate files.
---
 libs/getbits/Makefile.am  | 4 ++--
 libs/getbits/gstgetbits.h | 4 ++--
 test/.gitignore           | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/getbits/Makefile.am b/libs/getbits/Makefile.am
index 0c798db2c8..1a687b1787 100644
--- a/libs/getbits/Makefile.am
+++ b/libs/getbits/Makefile.am
@@ -5,10 +5,10 @@ filter_LTLIBRARIES = libgstgetbits.la
 if HAVE_CPU_I386
 GSTARCH_SRCS = gstgetbits_i386.s
 else
-GSTARCH_SRCS = gstgetbits_generic.c
+GSTARCH_SRCS = 
 endif
 
-libgstgetbits_la_SOURCES = gstgetbits.c gstgetbits_inl.h $(GSTARCH_SRCS)
+libgstgetbits_la_SOURCES = gstgetbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
 EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s gstgetbits_generic.c
 
 libgstgetbitsincludedir = $(includedir)/gst/libs/gstgetbits
diff --git a/libs/getbits/gstgetbits.h b/libs/getbits/gstgetbits.h
index bac0032ed7..b3ea9a44b4 100644
--- a/libs/getbits/gstgetbits.h
+++ b/libs/getbits/gstgetbits.h
@@ -7,7 +7,7 @@
 // FIXME - remove this HAVE_LIBMMX - let configure set it.
 #undef HAVE_LIBMMX
 
-#include <byteswap.h>
+//#include <byteswap.h>
 
 #ifdef HAVE_LIBMMX
 #include <mmx.h>
@@ -30,7 +30,7 @@
 #else
 #  if defined (__i386__)
 #    define swab32(x) __i386_swab32(x)
-     static inline const guint32 __i386_swab32(guint32 x)
+     static inline const unsigned long __i386_swab32(unsigned long x)
       {
          __asm__("bswap %0" : "=r" (x) : "0" (x));
          return x;
diff --git a/test/.gitignore b/test/.gitignore
index a00a6b4687..40244b01f8 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -43,3 +43,4 @@ mp2tomp1
 mp2toavi
 mp1tomp1
 pipetest
+mp3tovorbis