Michael Niedermayer c8571c61ec Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3' ...

* commit '8ddc32629a6d6be77256694c9e322dde134609f3':
  mem: add av_strndup() for duplicating substrings

Conflicts:
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-14 00:29:06 +02:00

14 KiB

Raw Blame History

View Raw