Commit 27ce8054 authored by Max Kellermann's avatar Max Kellermann

Merge tag 'v0.18.19' into v0.19.x

parents e72eef42 04f627c2
ver 0.19.5 (not yet released) ver 0.19.5 (not yet released)
* input * input
- nfs: fix crash on connection failure - nfs: fix crash on connection failure
* archive
- zzip: fix crash after seeking
* decoder * decoder
- dsdiff, dsf, opus: fix deadlock while seeking - dsdiff, dsf, opus: fix deadlock while seeking
- mp4v2: remove because of incompatible license - mp4v2: remove because of incompatible license
...@@ -136,6 +138,10 @@ ver 0.19 (2014/10/10) ...@@ -136,6 +138,10 @@ ver 0.19 (2014/10/10)
* install systemd unit for socket activation * install systemd unit for socket activation
* Android port * Android port
ver 0.18.19 (2014/11/26)
* archive
- zzip: fix crash after seeking
ver 0.18.18 (2014/11/18) ver 0.18.18 (2014/11/18)
* decoder * decoder
- ffmpeg: support opus - ffmpeg: support opus
......
...@@ -168,12 +168,13 @@ bool ...@@ -168,12 +168,13 @@ bool
ZzipInputStream::Seek(offset_type new_offset, Error &error) ZzipInputStream::Seek(offset_type new_offset, Error &error)
{ {
zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET); zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET);
if (ofs != -1) { if (ofs < 0) {
error.Set(zzip_domain, "zzip_seek() has failed"); error.Set(zzip_domain, "zzip_seek() has failed");
offset = ofs; return false;
return true;
} }
return false;
offset = ofs;
return true;
} }
/* exported structures */ /* exported structures */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment