]>
Commit | Line | Data |
---|---|---|
108c5f7c ER |
1 | --- chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc~ 2012-12-20 10:01:10.000000000 +0200 |
2 | +++ chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc 2013-01-06 13:47:49.557009450 +0200 | |
3 | @@ -15,8 +15,7 @@ | |
4 | #include "media/base/decoder_buffer.h" | |
5 | #include "media/base/demuxer.h" | |
6 | #include "media/base/pipeline.h" | |
7 | -#include "third_party/opus/src/include/opus.h" | |
8 | -#include "third_party/opus/src/include/opus_multistream.h" | |
9 | +#include "third_party/opus/opus.h" | |
10 | ||
11 | namespace media { | |
12 | ||
13 | --- chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 14:34:57.267997054 +0200 | |
14 | +++ chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 17:26:46.252153771 +0200 | |
15 | @@ -7,6 +7,11 @@ | |
16 | ||
88cfebfa ER |
17 | +#if !defined(THIRD_PARTY_OPUS_OPUS_H_) |
18 | +#define THIRD_PARTY_OPUS_OPUS_H_ | |
108c5f7c ER |
19 | #if defined(USE_SYSTEM_OPUS) |
20 | #include <opus/opus.h> | |
21 | +#include <opus/opus_multistream.h> | |
22 | #else | |
23 | #include "third_party/opus/src/include/opus.h" | |
24 | +#include "third_party/opus/src/include/opus_multistream.h" | |
25 | +#endif | |
26 | #endif |