FFmpeg/libavcodec
Michael Niedermayer 8c5fece11f Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
  aacdec: set AVFrame sample_rate

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12 15:00:03 +01:00
..
2014-02-12 13:12:22 +00:00
2014-01-09 19:33:07 +01:00
2014-02-08 02:04:12 +01:00
2014-02-08 02:04:12 +01:00
2014-02-08 02:04:12 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2014-02-07 19:32:16 +00:00
2014-02-06 02:51:19 +01:00
2014-02-08 12:27:00 +01:00
2014-01-21 11:58:52 +01:00
2014-02-12 13:12:22 +00:00
2014-01-02 22:07:09 +01:00
2014-02-12 13:12:22 +00:00
2013-12-22 22:03:47 +01:00
2014-02-08 02:55:51 +01:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2014-01-31 18:34:14 +01:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-01-10 17:51:13 +01:00
2014-01-04 04:16:46 +01:00
2013-12-22 14:59:31 +01:00
2014-01-27 20:36:42 +01:00
2014-02-12 13:12:22 +00:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00