[FFmpeg-cvslog] retry_transfer_wrapper: only call interrupt callback when less than requested is r/w.

Michael Niedermayer git at videolan.org
Tue Apr 5 02:08:53 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  5 01:58:03 2011 +0200| [6114bffa91714c83a533ae7e5a597ee605d35c3d] | committer: Michael Niedermayer

retry_transfer_wrapper: only call interrupt callback when less than requested is r/w.
Its a waste of cpu cycles otherwise

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6114bffa91714c83a533ae7e5a597ee605d35c3d
---

 libavformat/avio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 5dca68a..491ebc1 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -237,7 +237,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
         if (ret)
            fast_retries = FFMAX(fast_retries, 2);
         len += ret;
-        if (url_interrupt_cb())
+        if (len < size && url_interrupt_cb())
             return AVERROR_EXIT;
     }
     return len;



More information about the ffmpeg-cvslog mailing list