[Mplayer-cvslog] CVS: main/libmpcodecs ad_roqaudio.c,1.7,1.8 vd_roqvideo.c,1.3,1.4

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv21578

Modified Files:
	ad_roqaudio.c vd_roqvideo.c 
Log Message:
declarations moved to *.c files
reason: single .h contained both audio and video decl, they depend on
things like mp_image, which shouldn't be included in audio decoders...


Index: ad_roqaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_roqaudio.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_roqaudio.c	31 Aug 2002 13:09:23 -0000	1.7
+++ ad_roqaudio.c	22 Sep 2002 00:39:13 -0000	1.8
@@ -4,7 +4,6 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "roqav.h"
 
 static ad_info_t info = 
 {
@@ -16,6 +15,11 @@
 };
 
 LIBAD_EXTERN(roqaudio)
+
+// in native/roqav.c:
+void *roq_decode_audio_init(void);
+int roq_decode_audio(unsigned short *output, unsigned char *input,
+  int encoded_size, int channels, void *context);
 
 static int preinit(sh_audio_t *sh_audio)
 {

Index: vd_roqvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_roqvideo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_roqvideo.c	30 Aug 2002 21:44:20 -0000	1.3
+++ vd_roqvideo.c	22 Sep 2002 00:39:13 -0000	1.4
@@ -16,7 +16,10 @@
 
 LIBVD_EXTERN(roqvideo)
 
-#include "roqav.h"
+// in native/roqav.c:
+void *roq_decode_video_init(void);
+void roq_decode_video(void *context, unsigned char *encoded, 
+  int encoded_size, mp_image_t *mpi);
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){