diff options
author | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
commit | c22cbbf8280bb35c8fee5ae3931d3bc08b70099f (patch) | |
tree | 4654b9834f51c32746e2f72ce64191149647d87e /src/encoder/twolame_encoder.c | |
parent | f930f37d35995f0fc07f70aefc41babc0db1757e (diff) | |
parent | 5acee73fc85e44179120a5818247fc0760038cff (diff) | |
download | mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.gz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.xz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.zip |
Merge branch 'v0.16.x'
Conflicts:
src/output/osx_plugin.c
src/text_input_stream.c
Diffstat (limited to 'src/encoder/twolame_encoder.c')
-rw-r--r-- | src/encoder/twolame_encoder.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/encoder/twolame_encoder.c b/src/encoder/twolame_encoder.c index 00ebcc0d7..934b2ab24 100644 --- a/src/encoder/twolame_encoder.c +++ b/src/encoder/twolame_encoder.c @@ -300,6 +300,7 @@ const struct encoder_plugin twolame_encoder_plugin = { .finish = twolame_encoder_finish, .open = twolame_encoder_open, .close = twolame_encoder_close, + .end = twolame_encoder_flush, .flush = twolame_encoder_flush, .write = twolame_encoder_write, .read = twolame_encoder_read, |