ref: 7315b35e13a3a7c504ed6b1fe2d28ad500eb2701
parent: ca82894ef16bbd74839cb93e35486e5a3b90426d
parent: 317ffc203efc63333fc3b6a42fdb2887321a4325
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Mon Oct 8 23:07:06 EDT 2012
Merge branch 'exp_analysis7' Conflicts: celt/celt.c celt/mdct.c include/opus_defines.h src/opus_encoder.c