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-04-22 20:44:31 +02:00
2014-05-04 13:24:40 +02:00
2014-04-22 02:38:03 +02:00
2014-04-22 20:08:30 +02:00
2014-04-22 20:44:31 +02:00
2014-04-22 20:44:31 +02:00
2014-04-25 23:40:59 +02:00
2014-04-22 20:08:30 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-12 05:40:37 +02:00
2014-04-20 17:02:16 +02:00
2014-04-05 03:32:11 +02:00
2014-04-01 05:18:26 +02:00
2014-04-22 20:44:31 +02:00
2014-04-12 15:41:00 +02:00
2014-04-27 14:50:14 +02:00
2014-04-22 20:44:31 +02:00
2014-04-28 00:22:38 +02:00
2014-04-04 04:00:11 +02:00
2014-03-31 01:11:16 +02:00
2014-04-01 13:43:44 +02:00
2014-05-04 13:24:40 +02:00
2014-04-22 20:44:31 +02:00
2014-04-27 13:03:28 +02:00
2014-04-30 17:41:31 +02:00
2014-04-18 15:19:09 +02:00
2014-04-25 15:04:42 +02:00
2014-04-16 19:45:43 +02:00
2014-04-27 14:50:14 +02:00
2014-05-03 18:25:17 +02:00
2014-03-29 18:13:15 +01:00
2014-04-20 17:35:19 +02:00
2014-04-22 02:41:05 +02:00
2014-03-27 23:57:51 +01:00