Merge branch 'exp_analysis7'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 9 Oct 2012 07:07:06 +0000 (03:07 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 9 Oct 2012 07:07:06 +0000 (03:07 -0400)
commit7315b35e13a3a7c504ed6b1fe2d28ad500eb2701
treec6ed1c6869b13c5e2514c3ff7cfda4ce350f3fc8
parentca82894ef16bbd74839cb93e35486e5a3b90426d
parent317ffc203efc63333fc3b6a42fdb2887321a4325
Merge branch 'exp_analysis7'

Conflicts:
celt/celt.c
celt/mdct.c
include/opus_defines.h
src/opus_encoder.c
Makefile.am
celt/bands.c
celt/bands.h
celt/celt.c
celt/celt.h
celt/mdct.c
celt/pitch.c
src/opus_encoder.c