From ebc01c8f6dfc57c4ea5c33b29673e9851a6f19d1 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Thu, 1 Nov 2018 20:48:55 +0100 Subject: [PATCH] avformat/ftp: return AVERROR_EOF for EOF Without this FTP just hangs on eof... Signed-off-by: Marton Balint (cherry picked from commit 6a034adf7516fde8733064ed7ba5c77554298047) --- libavformat/ftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index 9aa7a45629..35bfbd47ab 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -783,13 +783,13 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) if (s->state == DISCONNECTED) { /* optimization */ if (s->position >= s->filesize) - return 0; + return AVERROR_EOF; if ((err = ftp_connect_data_connection(h)) < 0) return err; } if (s->state == READY) { if (s->position >= s->filesize) - return 0; + return AVERROR_EOF; if ((err = ftp_retrieve(s)) < 0) return err; }