From 403f01979cef7e03b8322ddb870e3959c8de0f77 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Wed, 4 Sep 2002 23:31:05 +0000 Subject: 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 --- src/libspudec/spu.c | 5 ++--- src/libspudec/xine_decoder.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/libspudec') 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 #include +#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" diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 13d6ceae1..a72734e00 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.72 2002/09/01 06:02:53 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.73 2002/09/04 23:31:10 guenter Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -32,9 +32,8 @@ #include #include -#include "buffer.h" -#include "events.h" #include "xine_internal.h" +#include "buffer.h" #include "video_out/alphablend.h" /* For clut_t */ #include "xine-engine/bswap.h" #include "xineutils.h" -- cgit v1.2.3