From f744584f7160db99c1003ef938c53d26eb427b00 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Tue, 24 Jun 2025 23:55:57 +0200 Subject: [PATCH] avformat/tee: fix multiple bsfs in tee Since 155508c6e925f4f2f5e77087a7e1925b3de735ff specifying multiple bsfs for different streams was broken: "[bsfs/a=h264_metadata:bsfs/v=h264_metadata]out.mp4|..." This incorrectly only parsed the first bsfs specification. The reason for this is that the dictionary is modified in the iterator, hence invalidating the iterator. The simplest fix for this is to simply iterate from the beginning in each loop given that the previous entry is removed. --- libavformat/tee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 0150ee9f22..0bac4fa202 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -197,7 +197,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) PROCESS_OPTION("fifo_options", parse_slave_fifo_options(value, tee_slave), ;); entry = NULL; - while ((entry = av_dict_get(options, "bsfs", entry, AV_DICT_IGNORE_SUFFIX))) { + while ((entry = av_dict_get(options, "bsfs", NULL, AV_DICT_IGNORE_SUFFIX))) { /* trim out strlen("bsfs") characters from key */ av_dict_set(&bsf_options, entry->key + 4, entry->value, 0); av_dict_set(&options, entry->key, NULL, 0);