PR #23819 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23819 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23819.patch
This reverts commit 58d39e99e26d1116f43a67d66ecfe71dba316875. Superseded by the generic recursion limit introduced in 597036b692b8c39198fe572aad027eeb4c13da35. Signed-off-by: Andreas Rheinhardt <[email protected]> >From 57c03743a999055aad69e72966a444e278ce5bf1 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Wed, 15 Jul 2026 16:14:02 +0200 Subject: [PATCH] Revert "avformat/concatdec: Check recursion depth" This reverts commit 58d39e99e26d1116f43a67d66ecfe71dba316875. Superseded by the generic recursion limit introduced in 597036b692b8c39198fe572aad027eeb4c13da35. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavformat/concatdec.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 665b4e3e66..c57d1b649a 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -73,7 +73,6 @@ typedef struct { ConcatMatchMode stream_match_mode; unsigned auto_convert; int segment_time_metadata; - int recursion_depth; } ConcatContext; static int concat_probe(const AVProbeData *probe) @@ -358,12 +357,6 @@ static int open_file(AVFormatContext *avf, unsigned fileno) if (ret < 0) return ret; - ret = av_dict_set_int(&options, "recursion_depth", cat->recursion_depth - 1, 0); - if (ret < 0) { - av_dict_free(&options); - return ret; - } - if ((ret = avformat_open_input(&cat->avf, file->url, NULL, &options)) < 0 || (ret = avformat_find_stream_info(cat->avf, NULL)) < 0) { av_log(avf, AV_LOG_ERROR, "Impossible to open '%s'\n", file->url); @@ -371,7 +364,6 @@ static int open_file(AVFormatContext *avf, unsigned fileno) avformat_close_input(&cat->avf); return ret; } - av_dict_set(&options, "recursion_depth", NULL, 0); if (options) { av_log(avf, AV_LOG_WARNING, "Unused options for '%s'.\n", file->url); /* TODO log unused options once we have a proper string API */ @@ -673,11 +665,6 @@ static int concat_read_header(AVFormatContext *avf) unsigned i; int ret; - if (cat->recursion_depth <= 0) { - av_log(avf, AV_LOG_ERROR, "Too deep recursion\n"); - return AVERROR_INVALIDDATA; - } - ret = concat_parse_script(avf); if (ret < 0) return ret; @@ -953,8 +940,6 @@ static const AVOption options[] = { OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC }, { "segment_time_metadata", "output file segment start time and duration as packet metadata", OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, - { "recursion_depth", "max recursion depth", - OFFSET(recursion_depth), AV_OPT_TYPE_INT, {.i64 = 10}, 0, INT_MAX, DEC }, { NULL } }; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
