Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-07 00:55:40 +0400
committerAnton Khirnov <anton@khirnov.net>2011-11-13 16:13:57 +0400
commit6ef350c16bf9a375a1ea3e531019ea922ae5a1e1 (patch)
tree902a38b60845690aaee273a6fd3a18dfb183c26f /libavformat/rtpenc_chain.c
parent6f1b7b39449c4cd58e37d831d5d97bfd25eb26f0 (diff)
avformat: Pass the interrupt callback on to chained muxers/demuxers
There are a few more cases of chained demuxers, but they only use custom IO which don't do any blocking IO and thus don't need the callback.
Diffstat (limited to 'libavformat/rtpenc_chain.c')
-rw-r--r--libavformat/rtpenc_chain.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index f0e4dae8eb..b9d1690008 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. */