summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Degawa <ccom@randomderp.com>2020-10-08 12:45:21 +0000
committerJames Almer <jamrial@gmail.com>2020-10-08 10:05:09 -0300
commit0117d5aa03aca0158ee54b806d420fb1a974b788 (patch)
tree01d4de8f20227445b14ce3809f57ddd9109b4b4b
parentbc43588a71181a6b2ea01119a7551f0d76a37b32 (diff)
libavformat/dashdec: Fix issue with dash on Windows
Use xmlFree instead of av_freep snip from libxml2: * xmlGetProp: ... * Returns the attribute value or NULL if not found. * It's up to the caller to free the memory with xmlFree(). According to libxml2, you are supposed to use xmlFree instead of free on the pointer returned by it, and also using av_freep on Windows will call _aligned_free instead of normal free, causing _aligned_free to raise SIGTRAP and crashing ffmpeg and ffplay. Signed-off-by: Christopher Degawa <ccom@randomderp.com>
-rw-r--r--libavformat/dashdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 99b9c45439..42ea74635b 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1145,7 +1145,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url,
}
err:
- av_freep(&c->adaptionset_lang);
+ xmlFree(c->adaptionset_lang);
return ret;
}