diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-10-09 03:07:06 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-10-09 03:07:06 -0400 |
| commit | 7315b35e13a3a7c504ed6b1fe2d28ad500eb2701 (patch) | |
| tree | c6ed1c6869b13c5e2514c3ff7cfda4ce350f3fc8 /src/opus_demo.c | |
| parent | ca82894ef16bbd74839cb93e35486e5a3b90426d (diff) | |
| parent | 317ffc203efc63333fc3b6a42fdb2887321a4325 (diff) | |
| download | opus-7315b35e13a3a7c504ed6b1fe2d28ad500eb2701.tar.gz | |
Merge branch 'exp_analysis7'
Conflicts:
celt/celt.c
celt/mdct.c
include/opus_defines.h
src/opus_encoder.c
Diffstat (limited to 'src/opus_demo.c')
0 files changed, 0 insertions, 0 deletions