Merge branch 'exp_surround1'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 1 Oct 2013 21:06:09 +0000 (17:06 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 1 Oct 2013 21:06:09 +0000 (17:06 -0400)
1  2 
celt/celt_encoder.c

Simple merge