Browse Source

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.
tags/n0.9
Martin Storsjö Anton Khirnov 13 years ago
parent
commit
6ef350c16b
2 changed files with 3 additions and 0 deletions
  1. +2
    -0
      libavformat/rtpenc_chain.c
  2. +1
    -0
      libavformat/sapdec.c

+ 2
- 0
libavformat/rtpenc_chain.c View File

@@ -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. */


+ 1
- 0
libavformat/sapdec.c View File

@@ -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;


Loading…
Cancel
Save