FFmpeg/libavcodec
Michael Niedermayer ba4fba8f48 Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
  aacdec: Support for ER AAC ELD 480.

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:49:17 +01:00
..
2015-02-04 09:45:41 +00:00
2014-12-18 16:10:23 +01:00
2014-11-30 12:56:02 +01:00
2015-01-07 19:46:16 +01:00
2015-01-27 12:37:34 +01:00
2015-01-09 20:33:53 +01:00
2014-12-18 23:27:14 +01:00
2015-01-05 01:45:49 +01:00
2014-12-08 13:29:18 +00:00
2015-01-27 12:37:34 +01:00
2014-11-26 04:11:16 +01:00
2015-01-29 17:33:38 +00:00
2015-02-01 19:13:38 +01:00
2015-02-01 16:18:39 +01:00
2015-02-01 16:18:39 +01:00
2014-11-25 02:00:06 +00:00
2015-01-17 13:01:26 +01:00
2015-01-15 01:25:16 +01:00
2015-02-04 09:45:41 +00:00
2014-12-20 11:29:19 +01:00
2014-12-20 11:29:19 +01:00
2015-01-22 01:47:54 +01:00
2014-12-03 11:56:22 +01:00
2015-01-22 01:33:05 +01:00
2015-01-22 01:49:04 +01:00
2015-01-22 01:49:04 +01:00
2015-01-13 17:27:45 +01:00
2015-01-11 12:15:03 +01:00
2015-01-05 01:45:49 +01:00
2014-11-25 02:00:27 +01:00
2015-01-20 01:16:25 +01:00
2015-02-01 16:18:39 +01:00
2015-01-30 19:15:01 +00:00
2015-01-18 00:34:19 +01:00
2015-02-04 09:45:41 +00:00
2015-02-04 09:45:41 +00:00
2015-01-19 17:12:09 +01:00