1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer ba040d4c8c 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>
2014-05-05 16:18:15 +02:00
..
2014-05-04 13:24:40 +02:00
2014-04-25 23:40:59 +02:00
2014-04-27 14:50:14 +02:00
2014-04-28 00:22:38 +02:00
2014-05-04 13:24:40 +02:00
2014-04-27 13:03:28 +02:00
2014-04-30 17:41:31 +02:00
2014-04-25 15:04:42 +02:00
2014-04-27 14:50:14 +02:00
2014-05-03 18:25:17 +02:00