summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Pettenò <flameeyes@gmail.com>2007-03-31 16:47:39 +0000
committerMåns Rullgård <mans@mansr.com>2007-03-31 16:47:39 +0000
commitb83f7eb2ce629e181d063cf94838bd6ed79069e0 (patch)
treefa3f5ed44d7fc5f28f7360b2d055ab61dfeb43bb /libavcodec
parent6308cacaf4ae2d3fc92ecc53e52e16df0596f0f2 (diff)
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
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/faad.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/faad.c b/libavcodec/faad.c
index 80e5e0bf6c..01cbd40e7c 100644
--- a/libavcodec/faad.c
+++ b/libavcodec/faad.c
@@ -196,8 +196,7 @@ static int faac_decode_end(AVCodecContext *avctx)
{
FAACContext *s = (FAACContext *) avctx->priv_data;
- if (s->faacDecClose)
- s->faacDecClose(s->faac_handle);
+ s->faacDecClose(s->faac_handle);
dlclose(s->handle);
return 0;
@@ -228,6 +227,7 @@ static int faac_decode_init(AVCodecContext *avctx)
// resolve all needed function calls
dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
+ dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder)));
dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr
FAADAPI (*)(faacDecHandle)));
#ifndef FAAD2_VERSION
@@ -239,7 +239,6 @@ static int faac_decode_init(AVCodecContext *avctx)
dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*,
unsigned long, unsigned long*,
unsigned long*)));
- dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder)));
dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*,
unsigned long*, short*, unsigned long*)));
#else