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/rtpenc_chain.c | |
| parent | 4fa6e9d0b40653010b35278f7e8b556958341205 (diff) | |
| parent | 32caa7b13cecca59213c73fa94dd683c2b003bfd (diff) | |
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/rtpenc_chain.c')
| -rw-r--r-- | libavformat/rtpenc_chain.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index f4590faa08..8a5adf54ed 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -47,6 +47,8 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st, av_free(rtpctx); return NULL; } + /* Pass the interrupt callback on */ + rtpctx->interrupt_callback = s->interrupt_callback; /* Copy the max delay setting; the rtp muxer reads this. */ rtpctx->max_delay = s->max_delay; /* Copy other stream parameters. */ |