Zebediah Figura : l3codeca.acm: Call mp3_horse() directly.
Alexandre Julliard
julliard at winehq.org
Wed Jun 9 16:43:06 CDT 2021
Module: wine
Branch: master
Commit: 7a85ec7172639353af8c4873830bd7d1dba52c71
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a85ec7172639353af8c4873830bd7d1dba52c71
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Jun 4 16:43:37 2021 -0500
l3codeca.acm: Call mp3_horse() directly.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/l3codeca.acm/mpegl3.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c
index e625a75b7ac..25097d424c4 100644
--- a/dlls/l3codeca.acm/mpegl3.c
+++ b/dlls/l3codeca.acm/mpegl3.c
@@ -113,8 +113,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx)
typedef struct tagAcmMpeg3Data
{
- void (*convert)(PACMDRVSTREAMINSTANCE adsi,
- const unsigned char*, LPDWORD, unsigned char*, LPDWORD);
mpg123_handle *mh;
} AcmMpeg3Data;
@@ -241,7 +239,6 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels ||
adsi->pwfxDst->wBitsPerSample != 16)
goto theEnd;
- aad->convert = mp3_horse;
aad->mh = mpg123_new(NULL,&err);
mpg123_open_feed(aad->mh);
@@ -574,7 +571,7 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
MPEG3_Reset(adsi, aad);
}
- aad->convert(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst);
+ mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst);
adsh->cbSrcLengthUsed = nsrc;
adsh->cbDstLengthUsed = ndst;
More information about the wine-cvs
mailing list