diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:37:35 +0000 | 
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-20 23:37:37 +0000 | 
| commit | 07715ac3b9309b397fb911ef81a393c4493cf20d (patch) | |
| tree | ce454a3265d2b4083dd5be18ad2cf75667a24ff1 /cmds | |
| parent | 9d2e0daedd2c55314d60dd4620e66eccf4b0ca0b (diff) | |
| parent | 36802bd18b7b4e8c87fa019c7e3068bee330d174 (diff) | |
| download | frameworks_av-07715ac3b9309b397fb911ef81a393c4493cf20d.zip frameworks_av-07715ac3b9309b397fb911ef81a393c4493cf20d.tar.gz frameworks_av-07715ac3b9309b397fb911ef81a393c4493cf20d.tar.bz2  | |
Merge "C++11 compatibility."
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/SineSource.h | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/stagefright/SineSource.h b/cmds/stagefright/SineSource.h index d772e0d..be05661 100644 --- a/cmds/stagefright/SineSource.h +++ b/cmds/stagefright/SineSource.h @@ -3,6 +3,7 @@  #define SINE_SOURCE_H_  #include <media/stagefright/MediaSource.h> +#include <utils/Compat.h>  namespace android { @@ -24,7 +25,7 @@ protected:  private:      enum { kBufferSize = 8192 }; -    static const double kFrequency = 500.0; +    static const CONSTEXPR double kFrequency = 500.0;      bool mStarted;      int32_t mSampleRate;  | 
