diff options
| author | Christopher Degawa <ccom@randomderp.com> | 2020-10-08 12:45:21 +0000 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-27 07:20:59 +0100 |
| commit | 9e950320e73a3ac649e1f025a1c28e57b7ca145b (patch) | |
| tree | adce95935e09e8b442bf045f2d88001fc9983eaa | |
| parent | f3ee6b2a3e04624fcec0f230d4a429ff6cf0ea54 (diff) | |
| download | ffmpeg-9e950320e73a3ac649e1f025a1c28e57b7ca145b.tar.gz | |
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>
(cherry picked from commit 0117d5aa03aca0158ee54b806d420fb1a974b788)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/dashdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 65f03e4a60..8a4ec9b560 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1155,7 +1155,7 @@ static int parse_manifest_adaptationset(AVFormatContext *s, const char *url, } err: - av_freep(&c->adaptionset_lang); + xmlFree(c->adaptionset_lang); return ret; } |