summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-08-07 16:13:41 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-08-07 16:13:41 +0000
commit916589570c3fcbc8c87e88deceffa6cdb53b4b8b (patch)
tree2ee7c20fbdafcaf53e0bbf2a8bf1672550999be8
parent426721f717d3bb2ff4fe6249500a7f1992c246a6 (diff)
ext/flac/gstflacenc.c: If seeking failed return the appropiate return value to FLAC.
Original commit message from CVS: * ext/flac/gstflacenc.c: (gst_flac_enc_seek_callback): If seeking failed return the appropiate return value to FLAC. Otherwise it thinks seeking was successfull and tries to rewrite parts of the headers which then get appended to the output.
-rw-r--r--ChangeLog7
-rw-r--r--ext/flac/gstflacenc.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f49fed4b..0faf96dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * ext/flac/gstflacenc.c: (gst_flac_enc_seek_callback):
+ If seeking failed return the appropiate return value to FLAC.
+ Otherwise it thinks seeking was successfull and tries to rewrite
+ parts of the headers which then get appended to the output.
+
2008-08-07 Tim-Philipp Müller <tim.muller at collabora co uk>
Patch by: Frederic Crozat <fcrozat@mandriva.org>
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 1e29343c..4f290c4a 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -797,6 +797,12 @@ gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
} else {
GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
"failed");
+#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
+#else
+ return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
+#endif
+
}
} else {
GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " failed (no peer pad)",