diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-15 17:05:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-15 17:05:58 +0100 |
| commit | a183c1776cfd020a37d028ebb0f641352f49697b (patch) | |
| tree | db2fdafe7fe071f2e50264317e2c4de6b6806f29 /src/lib/util.h | |
| parent | 11d0d8d07917543d6c40a6bb1fe5581ae216f5aa (diff) | |
| parent | 4fe7c89e54205c56f0fba2da24db66734ce23674 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index be70eb259..42514a12c 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -153,7 +153,6 @@ private: }; extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second); -extern std::pair<std::string, int> cpu_info (); class LocaleGuard { |