Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 14:13:29 +0000 (16:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 14:18:15 +0000 (16:18 +0200)
commitba040d4c8c1e9d55d12a6759bfa4932c11454da4
treee89e4e0698d5eba406228c637cb52bb7a1540129
parentdb9c138616c9babc3a0f02c6b7289c774cc5b65c
parent3828eb8519c1530392ab8820b1aa784602128afc
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsj√∂ <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c