[FFmpeg-cvslog] Merge commit '2f7065190ad48744014a02288799d03adfa613e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 13:33:14 2014 +0200| [c2e2b29b73aa04b040300882e7be35aab9697fe2] | committer: Michael Niedermayer

Merge commit '2f7065190ad48744014a02288799d03adfa613e0'

* commit '2f7065190ad48744014a02288799d03adfa613e0':
  libfdk-aac: Relicense the library wrappers to the ISC license

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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