Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:29:06 +0000 (00:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:29:06 +0000 (00:29 +0200)
commitc8571c61ec4c352e7eac7147b7c1644d2406189e
tree7b30d14ae332d5b9d5b79ba257cc2833d28e3855
parent097bf149c92aeae8af7f3559878e046a047e892d
parent8ddc32629a6d6be77256694c9e322dde134609f3
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>
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h