ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Apr 20 22:43:31 2015 +0200| [e6831c087e49157b64255388cc1bfdb60c76d79e] | committer: Michael Niedermayer
Merge commit '338ed3ed33c412c2828446c4e2a76949161fec6a' * commit '338ed3ed33c412c2828446c4e2a76949161fec6a': ffv1: Pass correct pointers to av_free() Conflicts: libavcodec/ffv1.c See: a3963cc8ec3b4e1780aadcbc0e5a7af625bae175 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6831c087e49157b64255388cc1bfdb60c76d79e --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog