ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Jan 29 20:28:24 2015 +0100| [bcadf5d940e72fbd5f9c6a72dfdef7edcf551a33] | committer: Michael Niedermayer
Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425' * commit '1279221cc4d63bc4449df86ae7a98e633f8be425': lavu: Check av_dict_set allocations Conflicts: libavutil/dict.c See: a963fdb0ea3fa6772ff8464838cd217a6369abfe Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcadf5d940e72fbd5f9c6a72dfdef7edcf551a33 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog