diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-16 12:32:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-16 12:32:04 +0100 |
| commit | 308488324dbc4d8b709d3fb1dc9fee0479346c21 (patch) | |
| tree | 446989a0bea3db683e5200da89c955140b175682 /src/lib/util.h | |
| parent | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (diff) | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index 8e65bbb54..58c2771b7 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -131,15 +131,7 @@ private: int _timeout; }; -class LocaleGuard -{ -public: - LocaleGuard (); - ~LocaleGuard (); - -private: - char* _old; -}; +extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second); /** @class ScopedTemporary * @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope. |