-
Michael Niedermayer authored
* commit 'bc76c469': aac: Wait to know the channels before allocating frame Conflicts: libavcodec/aacdec.c See: 676a395aMerged-by:
Michael Niedermayer <michaelni@gmx.at>
153d23ee
* commit 'bc76c469': aac: Wait to know the channels before allocating frame Conflicts: libavcodec/aacdec.c See: 676a395aMerged-by:Michael Niedermayer <michaelni@gmx.at>