Add spudec_new_scaled and spudec_draw_scaled for vobsub support.

Change what is passed to spudec_new for vobsub support.

Suppress conditional on USE_DVDREAD.

Transform everything that should into unsigned.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4078 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 5 insertions, 7 deletions

diff --git a/spudec.h b/spudec.h
index 701e62785a..fee6644139 100644
--- a/spudec.h
+++ b/spudec.h
@@ -1,16 +1,14 @@
-#include "config.h"
-#ifdef USE_DVDREAD
 #ifndef _MPLAYER_SPUDEC_H
 #define _MPLAYER_SPUDEC_H
 
-#include "stream.h"
-void spudec_heartbeat(void *this, int pts100);
-void spudec_assemble(void *this, unsigned char *packet, int len, int pts100);
+void spudec_heartbeat(void *this, unsigned int pts100);
+void spudec_assemble(void *this, unsigned char *packet, unsigned int len, unsigned int pts100);
 void spudec_draw(void *this, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
-void *spudec_new(dvd_priv_t *dvd_info);
+void spudec_draw_scaled(void *this, unsigned int dxs, unsigned int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height);
+void *spudec_new(unsigned int *palette);
 void spudec_free(void *this);
 void spudec_reset(void *this);	// called after seek
 
 #endif
-#endif