aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-04-04 23:10:38 +0200
committerMax Kellermann <max@duempel.org>2012-04-04 23:59:06 +0200
commit98a468a1013401298205390db43b63a6ff3a3478 (patch)
tree1ddc7ea2992fe9125f0631f8fa99b169f9d437f8
parent47c58c01d10526b3e4b4b6cff0faa17af4039916 (diff)
downloadmpd-98a468a1013401298205390db43b63a6ff3a3478.tar.gz
mpd-98a468a1013401298205390db43b63a6ff3a3478.tar.xz
mpd-98a468a1013401298205390db43b63a6ff3a3478.zip
encoder/vorbis: generate end-of-stream packet before tag
Don't reset the ogg_stream_state object, because this discards the end-of-stream packet that was just added.
-rw-r--r--NEWS2
-rw-r--r--src/encoder/vorbis_encoder.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8eb3ed3bc..caa3cd073 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ ver 0.16.8 (2012/??/??)
* decoder:
- vorbis (and others): fix seeking at startup
- ffmpeg: read the "year" tag
+* encoder:
+ - vorbis: generate end-of-stream packet before tag
* output:
- jack: check for connection failure before starting playback
- jack: workaround for libjack1 crash bug
diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c
index 38a998bd2..519d7cbf6 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;
}