fix AVDictionary memory leak

Author: debugly

…9-bluray-protocol-add-dvd-fallback.patch …7-bluray-protocol-add-dvd-fallback.patchpatches/ffmpeg-n6.1/0029-bluray-protocol-add-dvd-fallback.patch renamed to patches/ffmpeg-n6.1/0027-bluray-protocol-add-dvd-fallback.patch patches/ffmpeg-n6.1/0029-bluray-protocol-add-dvd-fallback.patch renamed to patches/ffmpeg-n6.1/0027-bluray-protocol-add-dvd-fallback.patch

@@ -1,34 +1,39 @@
-From b5176510c15322f2223c5e16af20e65be98db163 Mon Sep 17 00:00:00 2001
+From 7f96723900b9103059abc487f57aa34e049e8e9c Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
-Date: Wed, 19 Mar 2025 13:22:27 +0800
-Subject: [PATCH 29] bluray protocol add dvd fallback
+Date: Fri, 28 Mar 2025 11:15:04 +0800
+Subject: [PATCH 27] bluray protocol add dvd fallback
 
 ---
- libavformat/demux.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
+ libavformat/demux.c | 31 ++++++++++++++++++++++++++-----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/libavformat/demux.c b/libavformat/demux.c
-index 51fff7b..05e02db 100644
+index 3c8f194..5620e0f 100644
 --- a/libavformat/demux.c
 +++ b/libavformat/demux.c
-@@ -158,7 +158,10 @@ static int init_input(AVFormatContext *s, const char *filename,
+@@ -158,7 +158,8 @@ static int init_input(AVFormatContext *s, const char *filename,
      int ret;
      AVProbeData pd = { filename, NULL, 0 };
      int score = AVPROBE_SCORE_RETRY;
 -
 +    AVDictionary *tmp_opts = NULL;
-+    if (options && (av_stristart(filename, "bluray://", NULL) || av_stristart(filename, "dvd://", NULL))) {
-+        av_dict_copy(&tmp_opts, *options, 0);
-+    }
++    
      if (s->pb) {
          s->flags |= AVFMT_FLAG_CUSTOM_IO;
          if (!s->iformat)
-@@ -174,8 +177,23 @@ static int init_input(AVFormatContext *s, const char *filename,
+@@ -173,10 +174,30 @@ static int init_input(AVFormatContext *s, const char *filename,
+     if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
          (!s->iformat && (s->iformat = av_probe_input_format2(&pd, 0, &score))))
          return score;
- 
+-
 -    if ((ret = s->io_open(s, &s->pb, filename, AVIO_FLAG_READ | s->avio_flags, options)) < 0)
 -        return ret;
+-
++    
++    if (options && (av_stristart(filename, "bluray://", NULL) || av_stristart(filename, "dvd://", NULL))) {
++        av_dict_copy(&tmp_opts, *options, 0);
++    }
++
 +    if ((ret = s->io_open(s, &s->pb, filename, AVIO_FLAG_READ | s->avio_flags,
 +                          options)) < 0) {
 +        if (av_stristart(filename, "bluray://", NULL)) {
@@ -43,12 +48,14 @@ index 51fff7b..05e02db 100644
 +            av_dict_free(&tmp_opts);
 +            return ret;
 +        } else {
++            av_dict_free(&tmp_opts);
 +            return ret;
 +        }
 +    }
- 
++    av_dict_free(&tmp_opts);
      if (s->iformat)
          return 0;
+     return av_probe_input_buffer2(s->pb, &s->iformat, filename,
 -- 
 2.39.5 (Apple Git-154)
 

…-for-network-Blu-ray-Disc-and-BDMV.patch …-for-network-Blu-ray-Disc-and-BDMV.patchpatches/ffmpeg-n6.1/0027-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch renamed to patches/ffmpeg-n6.1/0028-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch patches/ffmpeg-n6.1/0027-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch renamed to patches/ffmpeg-n6.1/0028-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch

@@ -1,7 +1,7 @@
 From 22d3925e8fec79ca0dd23dbdb7eb6f9a9d53ee96 Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Mon, 24 Mar 2025 09:31:42 +0800
-Subject: [PATCH 27]  custom bluray fs for network Blu-ray Disc and BDMV
+Subject: [PATCH 28]  custom bluray fs for network Blu-ray Disc and BDMV
 
 ---
  libavformat/Makefile           |   2 +-

…nd-the-right-m2ts-then-read-seek-i.patch …nd-the-right-m2ts-then-read-seek-i.patchpatches/ffmpeg-n6.1/0028-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch renamed to patches/ffmpeg-n6.1/0029-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch patches/ffmpeg-n6.1/0028-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch renamed to patches/ffmpeg-n6.1/0029-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch

@@ -1,7 +1,7 @@
 From 28cdd2169e400e113ef6f681d2e1eee8ebc83afa Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Fri, 21 Mar 2025 19:00:43 +0800
-Subject: [PATCH 28] bluray open and find the right m2ts, then read\seek it 
+Subject: [PATCH 29] bluray open and find the right m2ts, then read\seek it 
  direactly instread of bluray logic.
 
 ---