ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 14 00:29:06 2014 +0200| [c8571c61ec4c352e7eac7147b7c1644d2406189e] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8571c61ec4c352e7eac7147b7c1644d2406189e --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog