]> git.sesse.net Git - ffmpeg/commit
Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:45:54 +0000 (01:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 00:28:44 +0000 (02:28 +0200)
commit153d23ee39db0304bd2a9e7b26eef9562be07eb8
tree1f22d63e542ae32e6f98ac3062bb6f01a271362e
parent476692abdb3207b722c2cbbd9ea3720004aae440
parentbc76c46943272515805d7ac48ca39f14826d1fed
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>
libavcodec/aacdec.c