Merge pull request #4583 from fritsch/xbmc-upstream

ffmpeg: Backport c94305ae23318c8956a30485cd5642829f4f16a9 to fix #15085

diff --git a/lib/ffmpeg/libavformat/id3v2.c b/lib/ffmpeg/libavformat/id3v2.c
index 2cab5ac..2e8d06d 100644 (file)
--- a/lib/ffmpeg/libavformat/id3v2.c
+++ b/lib/ffmpeg/libavformat/id3v2.c
@@ -822,6 +822,8 @@ void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)
         av_freep(&current);
         current = next;
     }
+
+    *extra_meta = NULL;
 }
 
 int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)

diff --git a/lib/ffmpeg/patches/0073-ff-id3v2-free-extra-meta-set-the-pointer-pointing-to-extra-meta-to-null.patch b/lib/ffmpeg/patches/0073-ff-id3v2-free-extra-meta-set-the-pointer-pointing-to-extra-meta-to-null.patch
new file mode 100644 (file)
index 0000000..f4135a1
--- /dev/null
+++ b/lib/ffmpeg/patches/0073-ff-id3v2-free-extra-meta-set-the-pointer-pointing-to-extra-meta-to-null.patch
@@ -0,0 +1,29 @@
+From c94305ae23318c8956a30485cd5642829f4f16a9 Mon Sep 17 00:00:00 2001
+From: Peter Ross <pross@xvid.org>
+Date: Sat, 19 Apr 2014 12:12:00 +1000
+Subject: [PATCH] ff_id3v2_free_extra_meta: set the pointer pointing to
+ extra_meta to NULL
+
+Fixes ticket #3530.
+
+Signed-off-by: Peter Ross <pross@xvid.org>
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+---
+ libavformat/id3v2.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
+index 8a8989b..15b58d7 100644
+--- a/libavformat/id3v2.c
++++ b/libavformat/id3v2.c
+@@ -937,6 +937,8 @@ void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)
+         av_freep(&current);
+         current = next;
+     }
++
++    *extra_meta = NULL;
+ }
+ 
+ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)
+-- 
+1.7.10.4