[MPlayer-cvslog] r22432 - trunk/libmpdemux/demux_avs.c

[reimar]

Author: reimar
Date: Sun Mar  4 10:45:32 2007
New Revision: 22432

Modified:
   trunk/libmpdemux/demux_avs.c

Log:
Fix type and usage of avs_get_audio function


Modified: trunk/libmpdemux/demux_avs.c
==============================================================================
--- trunk/libmpdemux/demux_avs.c	(original)
+++ trunk/libmpdemux/demux_avs.c	Sun Mar  4 10:45:32 2007
@@ -54,8 +54,7 @@ typedef WINAPI void (*imp_avs_release_cl
 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 @@ static int demux_avs_fill_buffer(demuxer
         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;