Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

e070300a

Commit e070300a authored 10 years ago by Jean-Marc Valin

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into derf_rtp_edits

Conflicts:
	doc/draft-ietf-payload-rtp-opus.xml

parents 1e87fea3 bb4b6885

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

doc/draft-ietf-payload-rtp-opus.xml 20 additions, 9 deletions

doc/draft-ietf-payload-rtp-opus.xml
silk/CNG.c 15 additions, 6 deletions

silk/CNG.c
silk/decode_frame.c 5 additions, 5 deletions

silk/decode_frame.c
silk/fixed/burg_modified_FIX.c 12 additions, 16 deletions

silk/fixed/burg_modified_FIX.c
src/opus_multistream_encoder.c 30 additions, 4 deletions

src/opus_multistream_encoder.c
win32/genversion.bat 6 additions, 6 deletions

win32/genversion.bat

with 88 additions and 46 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