Before the patch, opening a DASH file containing streams which require experimental decoders was problematic. No matter where the -strict -2 was put on the command line, the option was not passed to the demuxer for that component. This resulted in an error, prompting the user to add the -strict -2 flag, which is already present. Decoding appeared to continue correctly however.
Patch removes the error message by creating an options object for the demuxer created for the component, which inherits from the parent demuxer. Signed-off-by: Frank Plowman <[email protected]> --- Changes since v1: Use nb_streams stream_info_opts, not just one. libavformat/dashdec.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 555e21bf69..9c5ef5801a 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1911,13 +1911,28 @@ static int reopen_demux_for_component(AVFormatContext *s, struct representation if (ret < 0) goto fail; if (pls->n_fragments) { + AVDictionary **stream_info_opts; + + stream_info_opts = av_calloc(pls->ctx->nb_streams, sizeof(*stream_info_opts)); + if (!stream_info_opts) + goto fail; + #if FF_API_R_FRAME_RATE if (pls->framerate.den) { - for (i = 0; i < pls->ctx->nb_streams; i++) + for (i = 0; i < pls->ctx->nb_streams; i++) { pls->ctx->streams[i]->r_frame_rate = pls->framerate; + av_dict_set_int(&stream_info_opts[i], "strict", s->strict_std_compliance, 0); + } + } #endif - ret = avformat_find_stream_info(pls->ctx, NULL); + + ret = avformat_find_stream_info(pls->ctx, stream_info_opts); + + for (i = 0; i < pls->ctx->nb_streams; i++) + av_dict_free(&stream_info_opts[i]); + av_dict_free(stream_info_opts); + if (ret < 0) goto fail; } -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
