changeset 7470:a117511790c0

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...
author arpi
date Sun, 22 Sep 2002 00:39:13 +0000
parents f53f1f126a05
children 5e56ce70b551
files libmpcodecs/ad_roqaudio.c libmpcodecs/native/roqav.h libmpcodecs/vd_roqvideo.c
diffstat 3 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_roqaudio.c	Sun Sep 22 00:35:35 2002 +0000
+++ b/libmpcodecs/ad_roqaudio.c	Sun Sep 22 00:39:13 2002 +0000
@@ -4,7 +4,6 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "roqav.h"
 
 static ad_info_t info = 
 {
@@ -17,6 +16,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)
 {
   // minsize was stored in wf->nBlockAlign by the RoQ demuxer
--- a/libmpcodecs/native/roqav.h	Sun Sep 22 00:35:35 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#ifndef ROQAV_H
-#define ROQAV_H
-
-void *roq_decode_video_init(void);
-void roq_decode_video(void *context, unsigned char *encoded, 
-  int encoded_size, mp_image_t *mpi);
-
-void *roq_decode_audio_init(void);
-int roq_decode_audio(unsigned short *output, unsigned char *input,
-  int encoded_size, int channels, void *context);
-
-#endif // ROQAV_H
--- a/libmpcodecs/vd_roqvideo.c	Sun Sep 22 00:35:35 2002 +0000
+++ b/libmpcodecs/vd_roqvideo.c	Sun Sep 22 00:39:13 2002 +0000
@@ -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,...){