summaryrefslogtreecommitdiff
path: root/src/libspudec/spu.c
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-09-04 23:31:05 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-09-04 23:31:05 +0000
commit403f01979cef7e03b8322ddb870e3959c8de0f77 (patch)
tree0c40e03354069d59379b924ac9deeee0d17b10d8 /src/libspudec/spu.c
parentd1010f51a2cb07ba83d71423ab740a5a0c3d0934 (diff)
downloadxine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.gz
xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.bz2
merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
CVS patchset: 2606 CVS date: 2002/09/04 23:31:05
Diffstat (limited to 'src/libspudec/spu.c')
-rw-r--r--src/libspudec/spu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index c64dd699e..b302ce9dc 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -35,7 +35,7 @@
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: spu.c,v 1.44 2002/09/01 06:02:53 jcdutton Exp $
+ * $Id: spu.c,v 1.45 2002/09/04 23:31:10 guenter Exp $
*
*/
@@ -50,12 +50,11 @@
#include <sys/types.h>
#include <fcntl.h>
+#include "xine_internal.h"
#include "video_out/alphablend.h"
#include "xineutils.h"
-#include "xine_internal.h"
#include "spu.h"
#include "buffer.h"
-#include "events.h"
#include "xine-engine/bswap.h"
#include "nav_types.h"
#include "nav_read.h"