[PATCH 2/4] l3codeca.acm: Call mp3_horse() directly.
Zebediah Figura
z.figura12 at gmail.com
Fri Jun 4 16:43:37 CDT 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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;
--
2.30.2
More information about the wine-devel
mailing list