diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-13 23:43:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-14 00:33:39 +0100 |
| commit | 5f268ca5c57f3ad3050b58f513651c17304d3653 (patch) | |
| tree | f66ad7e5c4fd5656db9a95218f2ad433a982d81b /libavformat/sapdec.c | |
| parent | 4fa6e9d0b40653010b35278f7e8b556958341205 (diff) | |
| parent | 32caa7b13cecca59213c73fa94dd683c2b003bfd (diff) | |
| download | ffmpeg-5f268ca5c57f3ad3050b58f513651c17304d3653.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: pass options from AVFormatContext to avio.
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
avio: add avio_open2, taking an interrupt callback and options
avio: add support for passing options to protocols.
avio: add and use ffurl_protocol_next().
avformat: Pass the interrupt callback on to chained muxers/demuxers
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
avformat: Use ff_check_interrupt
avio: Add an internal utility function for checking the new interrupt callback
avio: Add AVIOInterruptCB
texi2html: remove stray \n
doc: prettyfy the texi2html documentation
swscale: handle unaligned buffers in yuv2plane1
Conflicts:
libavformat/avformat.h
libavformat/avio.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sapdec.c')
| -rw-r--r-- | libavformat/sapdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index 68e3c5c095..00e34b7387 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -85,7 +85,8 @@ static int sap_read_header(AVFormatContext *s, ff_url_join(url, sizeof(url), "udp", NULL, host, port, "?localport=%d", port); - ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_READ); + ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_READ, + &s->interrupt_callback, NULL); if (ret) goto fail; @@ -157,6 +158,7 @@ static int sap_read_header(AVFormatContext *s, } sap->sdp_ctx->max_delay = s->max_delay; sap->sdp_ctx->pb = &sap->sdp_pb; + sap->sdp_ctx->interrupt_callback = s->interrupt_callback; ret = avformat_open_input(&sap->sdp_ctx, "temp.sdp", infmt, NULL); if (ret < 0) goto fail; |