diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:18:40 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:48:42 +0300 |
commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/utils.c | |
parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ccf9c6550e..b6f8af1d09 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; } |