aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-06 22:55:40 +0200
committerAnton Khirnov <anton@khirnov.net>2011-11-13 13:13:57 +0100
commit6ef350c16bf9a375a1ea3e531019ea922ae5a1e1 (patch)
tree902a38b60845690aaee273a6fd3a18dfb183c26f
parent6f1b7b39449c4cd58e37d831d5d97bfd25eb26f0 (diff)
downloadffmpeg-6ef350c16bf9a375a1ea3e531019ea922ae5a1e1.tar.gz
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.
-rw-r--r--libavformat/rtpenc_chain.c2
-rw-r--r--libavformat/sapdec.c1
2 files changed, 3 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. */
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c
index 21f893554f..7b950cd617 100644
--- a/libavformat/sapdec.c
+++ b/libavformat/sapdec.c
@@ -157,6 +157,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;