summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-04 09:45:32 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-04 09:45:32 +0000
commit30220b2a243fac1b386e02b27b419b980b18f76a (patch)
treeebc9501b97a65d9f8c88b0f08daa03ee915c44a8 /libmpdemux
parent2987b207ede6232d1e5948675e03b3d22ebfdb8f (diff)
downloadmpv-30220b2a243fac1b386e02b27b419b980b18f76a.tar.bz2
mpv-30220b2a243fac1b386e02b27b419b980b18f76a.tar.xz
Fix type and usage of avs_get_audio function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22432 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_avs.c5
1 files changed, 2 insertions, 3 deletions
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;