aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/applehttp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-06 23:11:29 +0200
committerAnton Khirnov <anton@khirnov.net>2011-11-13 13:20:49 +0100
commit9d77a8faf9568f02daf06903559473efb4050c34 (patch)
tree1cb114b4b834a7a5ba94665f13971ca821973d69 /libavformat/applehttp.c
parent1dee0aca7401fc6c01f23ceedaff6533efb0fb28 (diff)
downloadffmpeg-9d77a8faf9568f02daf06903559473efb4050c34.tar.gz
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/applehttp.c')
-rw-r--r--libavformat/applehttp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 74d9f781e3..e0773ae87f 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -210,7 +210,8 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,
if (!in) {
close_in = 1;
- if ((ret = avio_open(&in, url, AVIO_FLAG_READ)) < 0)
+ if ((ret = avio_open2(&in, url, AVIO_FLAG_READ,
+ c->interrupt_callback, NULL)) < 0)
return ret;
}