Merge commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:09:55 +0000 (09:09 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:09:55 +0000 (09:09 +0200)
* commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1':
  libfdk-aacdec: Clean up properly if the init fails

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/libfdk-aacdec.c

Simple merge