[FFmpeg-cvslog] Merge commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Aug 18 09:09:55 2015 +0200| [e721cb8d8b5c64c4d9786928f6c629cb93611d74] | committer: Hendrik Leppkes

Merge commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1'

* commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1':
  libfdk-aacdec: Clean up properly if the init fails

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e721cb8d8b5c64c4d9786928f6c629cb93611d74
---