aboutsummaryrefslogtreecommitdiffstats
path: root/doc/fftools-common-opts.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-14 00:29:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-14 00:29:06 +0200
commitc8571c61ec4c352e7eac7147b7c1644d2406189e (patch)
tree7b30d14ae332d5b9d5b79ba257cc2833d28e3855 /doc/fftools-common-opts.texi
parent097bf149c92aeae8af7f3559878e046a047e892d (diff)
parent8ddc32629a6d6be77256694c9e322dde134609f3 (diff)
downloadffmpeg-c8571c61ec4c352e7eac7147b7c1644d2406189e.tar.gz
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>
Diffstat (limited to 'doc/fftools-common-opts.texi')
0 files changed, 0 insertions, 0 deletions