changeset 22414:01f781618827

Fix type and usage of avs_get_audio function
author reimar
date Sun, 04 Mar 2007 09:45:32 +0000
parents 219d577285e1
children c36b8d705d08
files libmpdemux/demux_avs.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_avs.c	Sun Mar 04 09:04:45 2007 +0000
+++ b/libmpdemux/demux_avs.c	Sun Mar 04 09:45:32 2007 +0000
@@ -54,8 +54,7 @@
 typedef WINAPI AVS_VideoFrame* (*imp_avs_get_frame)(AVS_Clip *, int n);
 typedef WINAPI void (*imp_avs_release_video_frame)(AVS_VideoFrame *);
 #ifdef ENABLE_AUDIO
-//typedef WINAPI int (*imp_avs_get_audio)(AVS_Clip *, void * buf, uint64_t start, uint64_t count); 
-typedef WINAPI int (*imp_avs_get_audio)(AVS_ScriptEnvironment *, void * buf, uint64_t start, uint64_t count); 
+typedef WINAPI int (*imp_avs_get_audio)(AVS_Clip *, void * buf, uint64_t start, uint64_t count); 
 #endif
 
 #define Q(string) # string
@@ -219,7 +218,7 @@
         int l = sh_audio->wf->nAvgBytesPerSec;
         dp = new_demux_packet(l);
         
-        if (AVS->avs_get_audio(AVS->avs_env, dp->buffer, AVS->frameno*sh_video->fps*l, l))
+        if (AVS->avs_get_audio(AVS->clip, dp->buffer, AVS->frameno*sh_video->fps*l, l))
         {
             mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_get_audio() failed\n");
             return 0;