diff --git a/libavformat/img2.h b/libavformat/img2.h
index 0781e681c5..6da9e47a97 100644
--- a/libavformat/img2.h
+++ b/libavformat/img2.h
@@ -46,7 +46,6 @@ typedef struct VideoDemuxData {
     int img_count;
     int is_pipe;
     int split_planes;       /**< use independent file for each Y, U, V plane */
-    char path[1024];
     char *pixel_format;     /**< Set by a private option. */
     int width, height;      /**< Set by a private option. */
     AVRational framerate;   /**< Set by a private option. */
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 1ccdeb9aa3..789f8b94c9 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -188,7 +188,6 @@ int ff_img_read_header(AVFormatContext *s1)
         return AVERROR(EINVAL);
     }
 
-    av_strlcpy(s->path, s1->url, sizeof(s->path));
     s->img_number = 0;
     s->img_count  = 0;
 
@@ -226,22 +225,22 @@ int ff_img_read_header(AVFormatContext *s1)
                 s->pattern_type = PT_SEQUENCE;
         }
         if (s->pattern_type == PT_SEQUENCE) {
-            if (find_image_range(&first_index, &last_index, s->path,
+            if (find_image_range(&first_index, &last_index, s1->url,
                                  s->start_number, s->start_number_range) < 0) {
-                if (s1->pb || avio_check(s->path, AVIO_FLAG_READ) > 0) {
+                if (s1->pb || avio_check(s1->url, AVIO_FLAG_READ) > 0) {
                     // Fallback to normal mode
                     s->pattern_type = PT_NONE;
                 } else {
                     av_log(s1, AV_LOG_ERROR,
                            "Could find no file or sequence with path '%s' and index in the range %d-%d\n",
-                           s->path, s->start_number, s->start_number + s->start_number_range - 1);
+                           s1->url, s->start_number, s->start_number + s->start_number_range - 1);
                     return AVERROR(ENOENT);
                 }
             }
         } else if (s->pattern_type == PT_GLOB) {
 #if HAVE_GLOB
             int gerr;
-            gerr = glob(s->path, GLOB_NOCHECK|GLOB_BRACE|GLOB_NOMAGIC, NULL, &s->globstate);
+            gerr = glob(s1->url, GLOB_NOCHECK|GLOB_BRACE|GLOB_NOMAGIC, NULL, &s->globstate);
             if (gerr != 0) {
                 return AVERROR(ENOENT);
             }
@@ -279,7 +278,7 @@ int ff_img_read_header(AVFormatContext *s1)
         st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
         st->codecpar->codec_id   = ffifmt(s1->iformat)->raw_codec_id;
     } else {
-        const char *str = strrchr(s->path, '.');
+        const char *str = strrchr(s1->url, '.');
         s->split_planes       = str && !av_strcasecmp(str + 1, "y");
         st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
         if (s1->pb) {
@@ -322,7 +321,7 @@ int ff_img_read_header(AVFormatContext *s1)
                 ffio_rewind_with_probe_data(s1->pb, &probe_buffer, probe_buffer_size);
         }
         if (st->codecpar->codec_id == AV_CODEC_ID_NONE)
-            st->codecpar->codec_id = ff_guess_image2_codec(s->path);
+            st->codecpar->codec_id = ff_guess_image2_codec(s1->url);
         if (st->codecpar->codec_id == AV_CODEC_ID_LJPEG)
             st->codecpar->codec_id = AV_CODEC_ID_MJPEG;
         if (st->codecpar->codec_id == AV_CODEC_ID_ALIAS_PIX) // we cannot distinguish this from BRENDER_PIX
@@ -364,13 +363,13 @@ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) {
 int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
 {
     VideoDemuxData *s = s1->priv_data;
-    char filename_bytes[1024];
-    char *filename = filename_bytes;
+    AVBPrint filename;
     int i, res;
     int size[3]           = { 0 }, ret[3] = { 0 };
     AVIOContext *f[3]     = { NULL };
     AVCodecParameters *par = s1->streams[0]->codecpar;
 
+    av_bprint_init(&filename, 0, AV_BPRINT_SIZE_UNLIMITED);
     if (!s->is_pipe) {
         /* loop over input */
         if (s->loop && s->img_number > s->img_last) {
@@ -379,36 +378,43 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
         if (s->img_number > s->img_last)
             return AVERROR_EOF;
         if (s->pattern_type == PT_NONE) {
-            av_strlcpy(filename_bytes, s->path, sizeof(filename_bytes));
+            av_bprintf(&filename, "%s", s1->url);
         } else if (s->use_glob) {
 #if HAVE_GLOB
-            filename = s->globstate.gl_pathv[s->img_number];
+            av_bprintf(&filename, "%s", s->globstate.gl_pathv[s->img_number]);
 #endif
         } else {
-        if (av_get_frame_filename(filename_bytes, sizeof(filename_bytes),
-                                  s->path,
-                                  s->img_number) < 0)
-            return AVERROR(EIO);
+            int ret = ff_bprint_get_frame_filename(&filename, s1->url, s->img_number, 0);
+            if (ret < 0) {
+                av_bprint_finalize(&filename, NULL);
+                return ret;
+            }
+        }
+        if (!av_bprint_is_complete(&filename)) {
+            av_bprint_finalize(&filename, NULL);
+            return AVERROR(ENOMEM);
         }
         for (i = 0; i < 3; i++) {
             if (s1->pb &&
-                !strcmp(filename_bytes, s->path) &&
+                !strcmp(filename.str, s1->url) &&
                 !s->loop &&
                 !s->split_planes) {
                 f[i] = s1->pb;
-            } else if (s1->io_open(s1, &f[i], filename, AVIO_FLAG_READ, NULL) < 0) {
+            } else if (s1->io_open(s1, &f[i], filename.str, AVIO_FLAG_READ, NULL) < 0) {
                 if (i >= 1)
                     break;
                 av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",
-                       filename);
+                       filename.str);
+                av_bprint_finalize(&filename, NULL);
                 return AVERROR(EIO);
             }
             size[i] = avio_size(f[i]);
 
             if (!s->split_planes)
                 break;
-            filename[strlen(filename) - 1] = 'U' + i;
+            filename.str[filename.len - 1] = 'U' + i;
         }
+        av_bprint_finalize(&filename, NULL);
 
         if (par->codec_id == AV_CODEC_ID_NONE) {
             AVProbeData pd = { 0 };
@@ -418,13 +424,15 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
             int score = 0;
 
             ret = avio_read(f[0], header, PROBE_BUF_MIN);
-            if (ret < 0)
+            if (ret < 0) {
+                av_bprint_finalize(&filename, NULL);
                 return ret;
+            }
             memset(header + ret, 0, sizeof(header) - ret);
             avio_skip(f[0], -ret);
             pd.buf = header;
             pd.buf_size = ret;
-            pd.filename = filename;
+            pd.filename = filename.str;
 
             ifmt = ffifmt(av_probe_input_format3(&pd, 1, &score));
             if (ifmt && ifmt->read_packet == ff_img_read_packet && ifmt->raw_codec_id)
@@ -457,7 +465,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     if (s->ts_from_file) {
         struct stat img_stat;
         av_assert0(!s->is_pipe); // The ts_from_file option is not supported by piped input demuxers
-        if (stat(filename, &img_stat)) {
+        if (stat(filename.str, &img_stat)) {
             res = AVERROR(EIO);
             goto fail;
         }
@@ -480,10 +488,11 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
      * as packet side_data.
      */
     if (!s->is_pipe && s->export_path_metadata == 1) {
-        res = add_filename_as_pkt_side_data(filename, pkt);
+        res = add_filename_as_pkt_side_data(filename.str, pkt);
         if (res < 0)
             goto fail;
     }
+    av_bprint_finalize(&filename, NULL);
 
     pkt->size = 0;
     for (i = 0; i < 3; i++) {
@@ -522,6 +531,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     }
 
 fail:
+    av_bprint_finalize(&filename, NULL);
     if (!s->is_pipe) {
         for (i = 0; i < 3; i++) {
             if (f[i] != s1->pb)