aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-02-23 02:38:45 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-23 02:38:45 +0000
commit1d14361dec7d6fcfaf1ed579ae9a5e8f9d84abab (patch)
tree0a864faf88659d16c68fd0d925cf0d6be4875dc6 /libavformat
parent75ecf1490093f391275f86b277bf3bc7eed84b8a (diff)
downloadffmpeg-1d14361dec7d6fcfaf1ed579ae9a5e8f9d84abab.tar.gz
Allow av_find_stream_info() to be aborted.
Based on a patch by netgem. Originally committed as revision 17538 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 63c77cfe59..f5bcf89081 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2020,6 +2020,11 @@ int av_find_stream_info(AVFormatContext *ic)
count = 0;
read_size = 0;
for(;;) {
+ if(url_interrupt_cb()){
+ ret= AVERROR(EINTR);
+ break;
+ }
+
/* check if one codec still needs to be handled */
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];