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/utils.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/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 902a170b53..1dfaa3caf3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2267,7 +2267,7 @@ int av_find_stream_info(AVFormatContext *ic) read_size = 0; for(;;) { if(url_interrupt_cb()){ - ret= AVERROR(EINTR); + ret= AVERROR_EXIT; av_log(ic, AV_LOG_DEBUG, "interrupted\n"); break; } |