ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Thu Nov 1 20:48:55 2018 +0100| [6a034adf7516fde8733064ed7ba5c77554298047] | committer: Marton Balint
avformat/ftp: return AVERROR_EOF for EOF Without this FTP just hangs on eof... Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a034adf7516fde8733064ed7ba5c77554298047 --- libavformat/ftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index 676f1c6b4c..5063b7c204 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -781,13 +781,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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
