FFmpeg/libavcodec
Michael Niedermayer 63fdedc794 Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
  aacpsy: Check memory allocation

Conflicts:
	libavcodec/aacpsy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 01:32:12 +02:00
..
2015-04-18 14:13:59 -03:00
2015-05-13 01:59:51 +02:00
2015-04-20 04:11:23 +02:00
2015-04-22 17:45:51 +02:00
2015-04-29 20:13:59 +02:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-05-06 17:50:09 +02:00
2015-05-28 16:10:56 +02:00
2015-05-28 01:01:16 +02:00
2015-04-28 00:04:58 +02:00
2015-05-26 05:23:29 +02:00
2015-04-28 00:04:58 +02:00
2015-05-25 16:08:08 +02:00
2015-05-07 07:19:52 -04:00
2015-05-20 15:50:58 +02:00
2015-05-26 18:36:13 -07:00
2015-05-13 00:41:38 +02:00
2015-04-18 18:07:54 -03:00