# HG changeset patch # User arpi # Date 1032655153 0 # Node ID a117511790c0f64e841d30760c294f3d91dced3a # Parent f53f1f126a052d2081d9781732c6345ab1282c2e 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... diff -r f53f1f126a05 -r a117511790c0 libmpcodecs/ad_roqaudio.c --- 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 diff -r f53f1f126a05 -r a117511790c0 libmpcodecs/native/roqav.h --- 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 diff -r f53f1f126a05 -r a117511790c0 libmpcodecs/vd_roqvideo.c --- 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,...){