ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 8
01:45:54 2015 +0200| [153d23ee39db0304bd2a9e7b26eef9562be07eb8] | committer:
Michael Niedermayer
Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
aac: Wait to know the channels before allocating frame
Conflicts:
libavcodec/aacdec.c
See: 676a395ab903cac623c5d6ddd0928c789e08a59e
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=153d23ee39db0304bd2a9e7b26eef9562be07eb8
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
