| Message ID | 1595073385-29007-3-git-send-email-mypopydev@gmail.com |
|---|---|
| State | Accepted |
| Commit | ba31fdfd7b7d5a077f3328bc8da5e61582b88354 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] doc/http: Update HTTP protocol options | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
Jun Zhao <mypopydev@gmail.com> 于2020年7月18日周六 下午8:19写道： > > From: Jun Zhao <barryjzhao@tencent.com> > > Enable the custom callback in sub-demuxer > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > --- > libavformat/dashdec.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c > index 694782c..c5a5ff6 100644 > --- a/libavformat/dashdec.c > +++ b/libavformat/dashdec.c > @@ -1943,6 +1943,7 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation > pls->ctx->flags = AVFMT_FLAG_CUSTOM_IO; > pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; > pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; > + pls->ctx->interrupt_callback = s->interrupt_callback; > ret = av_probe_input_buffer(&pls->pb, &in_fmt, "", NULL, 0, 0); > if (ret < 0) { > av_log(s, AV_LOG_ERROR, "Error when loading first fragment, playlist %d\n", (int)pls->rep_idx); > -- > 2.7.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". LGTM Thanks Steven
On Mon, Jul 20, 2020 at 10:18 AM Steven Liu <lingjiujianke@gmail.com> wrote: > > Jun Zhao <mypopydev@gmail.com> 于2020年7月18日周六 下午8:19写道： > > > > From: Jun Zhao <barryjzhao@tencent.com> > > > > Enable the custom callback in sub-demuxer > > > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > > --- > > libavformat/dashdec.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c > > index 694782c..c5a5ff6 100644 > > --- a/libavformat/dashdec.c > > +++ b/libavformat/dashdec.c > > @@ -1943,6 +1943,7 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation > > pls->ctx->flags = AVFMT_FLAG_CUSTOM_IO; > > pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; > > pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; > > + pls->ctx->interrupt_callback = s->interrupt_callback; > > ret = av_probe_input_buffer(&pls->pb, &in_fmt, "", NULL, 0, 0); > > if (ret < 0) { > > av_log(s, AV_LOG_ERROR, "Error when loading first fragment, playlist %d\n", (int)pls->rep_idx); > > -- > > 2.7.4 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > LGTM > Pushed, thx
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 694782c..c5a5ff6 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1943,6 +1943,7 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation pls->ctx->flags = AVFMT_FLAG_CUSTOM_IO; pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; + pls->ctx->interrupt_callback = s->interrupt_callback; ret = av_probe_input_buffer(&pls->pb, &in_fmt, "", NULL, 0, 0); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error when loading first fragment, playlist %d\n", (int)pls->rep_idx);