diff options
| author | Martin Storsjö <martin@martin.st> | 2011-11-06 22:50:44 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-13 13:12:17 +0100 |
| commit | 6f1b7b39449c4cd58e37d831d5d97bfd25eb26f0 (patch) | |
| tree | b97fb7b744d0d6d1d3611465b055dd10c17d8ebc /libavformat/mmsh.c | |
| parent | 9957cdbfd5ced5baae6ec97b97b08f1ad42aa4e4 (diff) | |
| download | ffmpeg-6f1b7b39449c4cd58e37d831d5d97bfd25eb26f0.tar.gz | |
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
Change all uses of these function to pass the relevant
callback on.
Diffstat (limited to 'libavformat/mmsh.c')
| -rw-r--r-- | libavformat/mmsh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index cbce2f5284..6ea1592d42 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -233,7 +233,8 @@ static int mmsh_open(URLContext *h, const char *uri, int flags) port = 80; // default mmsh protocol port ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, "%s", path); - if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ) < 0) { + if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ, + &h->interrupt_callback) < 0) { return AVERROR(EIO); } @@ -261,7 +262,8 @@ static int mmsh_open(URLContext *h, const char *uri, int flags) // close the socket and then reopen it for sending the second play request. ffurl_close(mms->mms_hd); memset(headers, 0, sizeof(headers)); - if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ) < 0) { + if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_FLAG_READ, + &h->interrupt_callback) < 0) { return AVERROR(EIO); } stream_selection = av_mallocz(mms->stream_num * 19 + 1); |