diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:18:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:48:42 +0100 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/applehttp.c | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
| download | ffmpeg-6947b0c42e0649f0c8355442d1732d642e467902.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/applehttp.c')
| -rw-r--r-- | libavformat/applehttp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 5118d03670..231abab87c 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -528,7 +528,7 @@ reload: return AVERROR_EOF; while (av_gettime() - c->last_load_time < c->target_duration*1000000) { if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; usleep(100*1000); } /* Enough time has elapsed since the last reload */ |