diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-03-13 00:42:27 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-15 08:09:19 -0400 |
| commit | c76374c6db5f486672f9df223f43e4892bd655c9 (patch) | |
| tree | 224beb5c4770ae0f10ffab26ec44f9bd1cc995e9 /libavformat/avio.c | |
| parent | bafa4dd3e69531f262472ac286e0ae7d4dbfbd97 (diff) | |
| download | ffmpeg-c76374c6db5f486672f9df223f43e4892bd655c9.tar.gz | |
Use AVERROR_EXIT with url_interrupt_cb.
Functions interrupted by url_interrupt_cb should not be restarted.
Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish
when the underlying system call was interrupted and actually needed to be
restarted.
This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed
content).
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/avio.c')
| -rw-r--r-- | libavformat/avio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 2265549266..5dca68a50c 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -238,7 +238,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int fast_retries = FFMAX(fast_retries, 2); len += ret; if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; } return len; } |