Browse Source

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
tags/v0.5
Diego Pettenò Måns Rullgård 18 years ago
parent
commit
b83f7eb2ce
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavcodec/faad.c

+ 2
- 3
libavcodec/faad.c View File

@@ -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


Loading…
Cancel
Save