generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll opus to 172355 and delete opus_demo from webrtc opus

Browse Source 
opus_demo has been inlucded in opus in chromium.

BUG=None
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/973013

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3317 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org
2012-12-19 17:24:30 +00:00
parent 6bc5d4dc07
commit ac77084583
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@@ -58,10 +58,10 @@ deps = {
(Var("googlecode_url") % "libyuv") + "/trunk@520", (Var("googlecode_url") % "libyuv") + "/trunk@520",
"third_party/opus": "third_party/opus":
Var("chromium_trunk") + "/src/third_party/opus@165570", Var("chromium_trunk") + "/src/third_party/opus@172355",
"third_party/opus/src": "third_party/opus/src":
Var("chromium_trunk") + "/deps/third_party/opus@165487", Var("chromium_trunk") + "/deps/third_party/opus@173498",
"third_party/protobuf": "third_party/protobuf":
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),

28
webrtc/modules/audio_coding/codecs/opus/opus.gypi
View File

@@ -29,32 +29,4 @@
], ],
}, },
], ],
'conditions': [
['include_tests==1', {
'targets': [
{
'target_name': 'opus_demo',
'type': 'executable',
'dependencies': [
'<(DEPTH)/third_party/opus/opus.gyp:opus'
],
'conditions': [
['OS == "win"', {
'defines': [
'inline=__inline',
],
}],
],
'sources': [
'<(DEPTH)/third_party/opus/src/src/opus_demo.c',
],
'include_dirs': [
'<(DEPTH)/third_party/opus/src/celt',
'<(DEPTH)/third_party/opus/src/include',
'<(DEPTH)/third_party/opus/src/silk',
],
},
],
}],
],
} }