FFmpeg/libavcodec
Michael Niedermayer 153d23ee39 Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
  aac: Wait to know the channels before allocating frame

Conflicts:
	libavcodec/aacdec.c

See: 676a395ab903cac623c5d6ddd0928c789e08a59e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 02:28:44 +02:00
..
2015-06-04 22:37:01 +02:00
2015-06-04 23:10:56 +02:00
2015-05-28 16:10:56 +02:00
2015-06-06 16:02:19 +00:00
2015-05-28 01:01:16 +02:00
2015-06-02 15:41:44 +02:00
2015-06-01 11:36:30 +03:00
2015-06-06 12:57:20 +02:00
2015-05-31 15:03:31 +02:00
2015-05-25 16:08:08 +02:00
2015-05-31 15:03:31 +02:00
2015-05-31 15:03:31 +02:00
2015-05-20 15:50:58 +02:00
2015-05-13 00:41:38 +02:00
2015-05-31 15:03:31 +02:00