Merge commit '390c89225d'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 24 Apr 2012 17:39:22 +0000 (13:39 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Tue, 24 Apr 2012 17:39:22 +0000 (13:39 -0400)
65 files changed:
1  2 
COPYING
Makefile.draft
celt/bands.c
celt/celt.c
celt/fixed_debug.h
celt/laplace.c
celt/mathops.c
celt/mathops.h
celt/opus_custom_demo.c
celt/pitch.c
celt/quant_bands.c
celt/rate.h
include/opus.h
include/opus_custom.h
include/opus_defines.h
include/opus_multistream.h
silk/API.h
silk/CNG.c
silk/Inlines.h
silk/LPC_inv_pred_gain.c
silk/LP_variable_cutoff.c
silk/MacroCount.h
silk/MacroDebug.h
silk/NLSF_VQ_weights_laroia.c
silk/NLSF_decode.c
silk/NLSF_del_dec_quant.c
silk/NSQ.c
silk/NSQ_del_dec.c
silk/PLC.c
silk/PLC.h
silk/SigProc_FIX.h
silk/VAD.c
silk/ana_filt_bank_1.c
silk/control_codec.c
silk/debug.h
silk/dec_API.c
silk/decode_core.c
silk/define.h
silk/enc_API.c
silk/fixed/apply_sine_window_FIX.c
silk/fixed/burg_modified_FIX.c
silk/fixed/find_LTP_FIX.c
silk/fixed/find_pred_coefs_FIX.c
silk/fixed/noise_shape_analysis_FIX.c
silk/fixed/prefilter_FIX.c
silk/fixed/solve_LS_FIX.c
silk/float/SigProc_FLP.h
silk/float/encode_frame_FLP.c
silk/lin2log.c
silk/macros.h
silk/pitch_est_defines.h
silk/process_NLSFs.c
silk/resampler_private_IIR_FIR.c
silk/resampler_private_down_FIR.c
silk/sigm_Q15.c
silk/stereo_LR_to_MS.c
silk/stereo_MS_to_LR.c
silk/typedef.h
src/opus_decoder.c
src/opus_encoder.c
src/opus_multistream.c
src/opus_private.h
src/repacketizer.c
tests/run_vectors.sh
tests/test_opus_decode.c

diff --cc COPYING
Simple merge
diff --cc Makefile.draft
Simple merge
diff --cc celt/bands.c
Simple merge
diff --cc celt/celt.c
Simple merge
Simple merge
diff --cc celt/laplace.c
Simple merge
diff --cc celt/mathops.c
Simple merge
diff --cc celt/mathops.h
Simple merge
Simple merge
diff --cc celt/pitch.c
Simple merge
Simple merge
diff --cc celt/rate.h
Simple merge
diff --cc include/opus.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc silk/API.h
Simple merge
diff --cc silk/CNG.c
Simple merge
diff --cc silk/Inlines.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc silk/NSQ.c
Simple merge
Simple merge
diff --cc silk/PLC.c
Simple merge
diff --cc silk/PLC.h
Simple merge
Simple merge
diff --cc silk/VAD.c
Simple merge
Simple merge
Simple merge
diff --cc silk/debug.h
Simple merge
diff --cc silk/dec_API.c
Simple merge
Simple merge
diff --cc silk/define.h
Simple merge
diff --cc silk/enc_API.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc silk/lin2log.c
Simple merge
diff --cc silk/macros.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc silk/sigm_Q15.c
Simple merge
Simple merge
Simple merge
diff --cc silk/typedef.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge