Merge branch 'exp_analysis'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Fri, 8 Mar 2013 17:29:53 +0000 (12:29 -0500)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Fri, 8 Mar 2013 17:29:53 +0000 (12:29 -0500)
commitf96fc8cc839331ae5e6e596fb931bf8261e129ff
tree05b841eb36fa15606f0e9e5b8157e7414c1ef130
parentfa43c770e0fd0ebc796a61a32c305dfcf3869128
parent73142b100adebe4321d3919ab657f510b7cfe40d
Merge branch 'exp_analysis'

Conflicts:
celt/celt_encoder.c
celt/celt_encoder.c
src/opus_encoder.c
src/opus_private.h