From 30220b2a243fac1b386e02b27b419b980b18f76a Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 4 Mar 2007 09:45:32 +0000 Subject: Fix type and usage of avs_get_audio function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22432 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demux_avs.c') diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 31de4378ce..977df8c551 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -54,8 +54,7 @@ typedef WINAPI void (*imp_avs_release_clip)(AVS_Clip *); 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_t *demuxer, demux_stream_t *ds) 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; -- cgit v1.2.3