[FFmpeg-devel] [PATCH] libavformat/cache: don't treat 0 as EOF

[Daniel Kučera]

2017-06-05 21:18 GMT+02:00 Daniel Kucera <daniel.kucera at gmail.com>:
> Signed-off-by: Daniel Kucera <daniel.kucera at gmail.com>
> ---
>  libavformat/cache.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/cache.c b/libavformat/cache.c
> index 6aabca2e78..66bbbf54c9 100644
> --- a/libavformat/cache.c
> +++ b/libavformat/cache.c
> @@ -201,7 +201,7 @@ static int cache_read(URLContext *h, unsigned char *buf, int size)
>      }
>
>      r = ffurl_read(c->inner, buf, size);
> -    if (r == 0 && size>0) {
> +    if (r == AVERROR_EOF && size>0) {
>          c->is_true_eof = 1;
>          av_assert0(c->end >= c->logical_pos);
>      }
> @@ -263,7 +263,7 @@ resolve_eof:
>                  if (whence == SEEK_SET)
>                      size = FFMIN(sizeof(tmp), pos - c->logical_pos);
>                  ret = cache_read(h, tmp, size);
> -                if (ret == 0 && whence == SEEK_END) {
> +                if (ret == AVERROR_EOF && whence == SEEK_END) {
>                      av_assert0(c->is_true_eof);
>                      goto resolve_eof;
>                  }
> --
> 2.11.0
>

Reminding for review.


-- 

S pozdravom / Best regards
Daniel Kucera.