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 | |
| 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')
| -rw-r--r-- | src/encoder/flac_encoder.c | 1 | ||||
| -rw-r--r-- | src/encoder/twolame_encoder.c | 1 | ||||
| -rw-r--r-- | src/encoder/vorbis_encoder.c | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c index 9f60bdae5..e32588e29 100644 --- a/src/encoder/flac_encoder.c +++ b/src/encoder/flac_encoder.c @@ -354,6 +354,7 @@ const struct encoder_plugin flac_encoder_plugin = { .finish = flac_encoder_finish, .open = flac_encoder_open, .close = flac_encoder_close, + .end = flac_encoder_flush, .flush = flac_encoder_flush, .write = flac_encoder_write, .read = flac_encoder_read, 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, diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c index 3e9d486b6..fcf2b5135 100644 --- a/src/encoder/vorbis_encoder.c +++ b/src/encoder/vorbis_encoder.c @@ -285,8 +285,6 @@ vorbis_encoder_pre_tag(struct encoder *_encoder, G_GNUC_UNUSED GError **error) vorbis_analysis_init(&encoder->vd, &encoder->vi); vorbis_block_init(&encoder->vd, &encoder->vb); - ogg_stream_reset(&encoder->os); - encoder->flush = true; return true; } @@ -407,6 +405,7 @@ const struct encoder_plugin vorbis_encoder_plugin = { .finish = vorbis_encoder_finish, .open = vorbis_encoder_open, .close = vorbis_encoder_close, + .end = vorbis_encoder_pre_tag, .flush = vorbis_encoder_flush, .pre_tag = vorbis_encoder_pre_tag, .tag = vorbis_encoder_tag, |