[FFmpeg-cvslog] Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 16:13:29 2014 +0200| [ba040d4c8c1e9d55d12a6759bfa4932c11454da4] | committer: Michael Niedermayer

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 at martin.st>
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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