Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Opus
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6268300c

Commit 6268300c authored 13 years ago by Jean-Marc Valin

Downloads
- Plain Diff

Merge remote-tracking branch 'greg/master'

Conflicts:
	src/opus_encoder.c

parents 2c02796c 64a3541a

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

libcelt/celt.c 2 additions, 2 deletions

libcelt/celt.c
libcelt/celt.h 2 additions, 2 deletions

libcelt/celt.h
libcelt/test_opus_custom.c 2 additions, 3 deletions

libcelt/test_opus_custom.c
silk/silk_API.h 3 additions, 3 deletions

silk/silk_API.h
silk/silk_dec_API.c 2 additions, 2 deletions

silk/silk_dec_API.c
silk/silk_enc_API.c 2 additions, 2 deletions

silk/silk_enc_API.c
src/opus.h 5 additions, 5 deletions

src/opus.h
src/opus_decoder.c 54 additions, 56 deletions

src/opus_decoder.c
src/opus_encoder.c 4 additions, 4 deletions

src/opus_encoder.c
src/test_opus.c 8 additions, 7 deletions

src/test_opus.c

with 84 additions and 86 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment