Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:49:17 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:49:17 +0000 (13:49 +0100)
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
  aacdec: Support for ER AAC ELD 480.

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/mpeg4audio.h

diff --cc configure
Simple merge
@@@ -294,8 -292,9 +295,9 @@@ struct AACContext 
      FFTContext mdct_small;
      FFTContext mdct_ld;
      FFTContext mdct_ltp;
+     IMDCT15Context *mdct480;
      FmtConvertContext fmt_conv;
 -    AVFloatDSPContext fdsp;
 +    AVFloatDSPContext *fdsp;
      int random_state;
      /** @} */
  
@@@ -3171,7 -2995,7 +3184,8 @@@ static av_cold int aac_decode_close(AVC
      ff_mdct_end(&ac->mdct_small);
      ff_mdct_end(&ac->mdct_ld);
      ff_mdct_end(&ac->mdct_ltp);
+     ff_imdct15_uninit(&ac->mdct480);
 +    av_freep(&ac->fdsp);
      return 0;
  }
  
Simple merge