# HG changeset patch # User reimar # Date 1254465399 0 # Node ID a2289b41a9f28a4e94a9a39f13d7b2c12b97d503 # Parent ae691877fdea49a481a0537a567d9f07368042dc Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as appropriate if it couldn't read any data at all. This should make handling of EOF and error simpler or make it work right without extra code in a few place (e.g. raw demuxer). diff -r ae691877fdea -r a2289b41a9f2 aviobuf.c --- a/aviobuf.c Thu Oct 01 21:15:36 2009 +0000 +++ b/aviobuf.c Fri Oct 02 06:36:39 2009 +0000 @@ -415,6 +415,10 @@ size -= len; } } + if (size1 == size) { + if (url_ferror(s)) return url_ferror(s); + if (url_feof(s)) return AVERROR_EOF; + } return size1 - size; } @@ -434,6 +438,10 @@ len = size; memcpy(buf, s->buf_ptr, len); s->buf_ptr += len; + if (!len) { + if (url_ferror(s)) return url_ferror(s); + if (url_feof(s)) return AVERROR_EOF; + } return len; }