This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 7c140b5f0673d5f89e874b2f6e607d90ae23a0a1 Author: James Almer <[email protected]> AuthorDate: Mon Oct 5 18:58:15 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Mon Oct 12 10:36:26 2026 -0300 fftools/ffplay: stop using deprecated AVStreamGroup fields Signed-off-by: James Almer <[email protected]> --- fftools/ffplay.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index c9369d6a72..bd64794b65 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1862,9 +1862,9 @@ static void uninit_bsf_graph(AVFormatContext *ic, int stream_index) av_bsf_graph_free(&stgi->graph); stgi->sink = NULL; - for (int i = 0; i < stgi->stg->nb_streams; i++) { - ici->streams[stgi->stg->streams[i]->index]->filter = NULL; - ici->streams[stgi->stg->streams[i]->index]->group = NULL; + for (int i = 0; i < stgi->stg->nb_entries; i++) { + ici->streams[stgi->stg->entries[i]->stream->index]->filter = NULL; + ici->streams[stgi->stg->entries[i]->stream->index]->group = NULL; } } sti->group = stgi; @@ -3341,7 +3341,7 @@ static int init_lcevc_graph(AVFormatContext *ic, int stream_index) const AVStreamGroupLayeredVideo *lcevc = stg->params.layered_video; AVStream *base_st = ic->streams[stream_index]; - AVStream *lcevc_st = stg->streams[lcevc->el_index]; + AVStream *lcevc_st = stg->entries[lcevc->el_index]->stream; Stream *lcevc_sti = ici->streams[lcevc_st->index]; Stream *base_sti = ici->streams[stream_index]; @@ -3831,11 +3831,18 @@ static int read_thread(void *arg) if (stg->type != AV_STREAM_GROUP_PARAMS_LCEVC) continue; - if (!av_bsf_get_by_name("lcevc_merge") || stg->nb_streams != 2) + if (!av_bsf_get_by_name("lcevc_merge") || stg->nb_entries != 2) continue; + for (int j = 0; j < stg->nb_entries; j++) { + AVStreamGroupEntry *entry = stg->entries[j]; + if (entry->type != AV_STREAM_GROUP_ENTRY_STREAM) { + ret = AVERROR_BUG; + goto fail; + } + } const AVStreamGroupLayeredVideo *lcevc = stg->params.layered_video; - const AVStream *base_st = ic->streams[stg->streams[!lcevc->el_index]->index]; + const AVStream *base_st = ic->streams[stg->entries[!lcevc->el_index]->stream->index]; Stream *base_sti = ici->streams[base_st->index]; base_sti->group = ici->stream_groups[i]; -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
