| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-17 06:13:12 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-17 06:13:42 (GMT) |
| commit | 21b3563dcbaabc177f6eec4c0ffc77c0981b92bd (patch) | |
| tree | ca2d86590899aefeeec7833237610db61ff18087 | |
| parent | a7e300649a7a2105a4f7edfaf936f0a9e05a2d43 (diff) | |
| parent | d433e1aefabd7934d9ba9ae552525faacf4e47c5 (diff) | |
| download | ffmpeg-21b3563dcbaabc177f6eec4c0ffc77c0981b92bd.zip ffmpeg-21b3563dcbaabc177f6eec4c0ffc77c0981b92bd.tar.gz ffmpeg-21b3563dcbaabc177f6eec4c0ffc77c0981b92bd.tar.bz2 | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mem: Make av_strdup allocate using av_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index a7f306a..5aad97a 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -258,7 +258,7 @@ char *av_strdup(const char *s) char *ptr = NULL; if (s) { int len = strlen(s) + 1; - ptr = av_malloc(len); + ptr = av_realloc(NULL, len); if (ptr) memcpy(ptr, s, len); } |