diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-13 21:28:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-13 21:28:36 +0100 |
| commit | e36c24bf1522593976de7de2c4d79c76f0ba36a8 (patch) | |
| tree | b342028831b620944ebc5a45946d82c1f69f64d0 /src/lib/util.h | |
| parent | 43b4e55710271c797b5d251c891047ed4da20e10 (diff) | |
| parent | a991c734ebfedb5456cec827d5eaf2583fdbb9a1 (diff) | |
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
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 3e1d7f4b4..0d745e50c 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -299,7 +299,6 @@ private: extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second); extern bool still_image_file (std::string); -extern std::pair<std::string, int> cpu_info (); class LocaleGuard { |