mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-03 02:58:02 +00:00
call faacDecClose() with all libfaad versions
patch by Diego Petteno flameeyes gmail com Originally committed as revision 8574 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
6308cacaf4
commit
b83f7eb2ce
@ -196,8 +196,7 @@ static int faac_decode_end(AVCodecContext *avctx)
|
|||||||
{
|
{
|
||||||
FAACContext *s = (FAACContext *) avctx->priv_data;
|
FAACContext *s = (FAACContext *) avctx->priv_data;
|
||||||
|
|
||||||
if (s->faacDecClose)
|
s->faacDecClose(s->faac_handle);
|
||||||
s->faacDecClose(s->faac_handle);
|
|
||||||
|
|
||||||
dlclose(s->handle);
|
dlclose(s->handle);
|
||||||
return 0;
|
return 0;
|
||||||
@ -228,6 +227,7 @@ static int faac_decode_init(AVCodecContext *avctx)
|
|||||||
|
|
||||||
// resolve all needed function calls
|
// resolve all needed function calls
|
||||||
dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
|
dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
|
||||||
|
dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder)));
|
||||||
dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr
|
dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr
|
||||||
FAADAPI (*)(faacDecHandle)));
|
FAADAPI (*)(faacDecHandle)));
|
||||||
#ifndef FAAD2_VERSION
|
#ifndef FAAD2_VERSION
|
||||||
@ -239,7 +239,6 @@ static int faac_decode_init(AVCodecContext *avctx)
|
|||||||
dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*,
|
dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*,
|
||||||
unsigned long, unsigned long*,
|
unsigned long, unsigned long*,
|
||||||
unsigned long*)));
|
unsigned long*)));
|
||||||
dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder)));
|
|
||||||
dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*,
|
dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*,
|
||||||
unsigned long*, short*, unsigned long*)));
|
unsigned long*, short*, unsigned long*)));
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user