From 2059c26359a74ba82f26e57cd88851bdce377214 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 22 Sep 2002 00:39:13 +0000
Subject: [PATCH] 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...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7471 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/ad_roqaudio.c  |  6 +++++-
 libmpcodecs/native/roqav.h | 12 ------------
 libmpcodecs/vd_roqvideo.c  |  5 ++++-
 3 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 libmpcodecs/native/roqav.h

diff --git a/libmpcodecs/ad_roqaudio.c b/libmpcodecs/ad_roqaudio.c
index a21c35856d..e55fcad56b 100644
--- a/libmpcodecs/ad_roqaudio.c
+++ b/libmpcodecs/ad_roqaudio.c
@@ -4,7 +4,6 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "roqav.h"
 
 static ad_info_t info = 
 {
@@ -17,6 +16,11 @@ static ad_info_t info =
 
 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 --git a/libmpcodecs/native/roqav.h b/libmpcodecs/native/roqav.h
deleted file mode 100644
index 9286f24fe4..0000000000
--- a/libmpcodecs/native/roqav.h
+++ /dev/null
@@ -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 --git a/libmpcodecs/vd_roqvideo.c b/libmpcodecs/vd_roqvideo.c
index bc0a6d3bfd..6d24a9d86a 100644
--- a/libmpcodecs/vd_roqvideo.c
+++ b/libmpcodecs/vd_roqvideo.c
@@ -16,7 +16,10 @@ static vd_info_t info = {
 
 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,...){