diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-03-02 22:35:20 +0100 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-03-02 22:35:20 +0100 |
| commit | 7167b1c4ce914facaa14cd6db8cf7219b622da97 (patch) | |
| tree | abc81a74ec51f953b5eec25a086a82287609ddbe /encoders/lame_encoder.h | |
| parent | 0c2f90ee5c713fcb3aedb236fcebe7dd6d323ba3 (diff) | |
| parent | 6e7b8f94bf7fdc087cd1eed604eabed6070dffad (diff) | |
Merge branch 'master' into cache_range
Conflicts:
music.cpp
Diffstat (limited to 'encoders/lame_encoder.h')
| -rw-r--r-- | encoders/lame_encoder.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/encoders/lame_encoder.h b/encoders/lame_encoder.h index d150f60..79bc944 100644 --- a/encoders/lame_encoder.h +++ b/encoders/lame_encoder.h @@ -11,9 +11,6 @@ class EncoderLame : public Encoder { private: lame_global_flags *gfp; RawAudioSource::p source; - - size_t encode(const uint8_t *input, size_t input_size, uint8_t *output, size_t output_size); - size_t flush(uint8_t *output, size_t output_size); public: EncoderLame(RawAudioSource::p source_); |