ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19 03:57:12 2014 +0100| [bce06eb059a22fa1cd76a13112c36a4353894cca] | committer: Michael Niedermayer
Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098' * commit '5d839778b9f3edb682b7f71dde4f80f07c75b098': lavu: Refactor side data wiping Conflicts: libavutil/frame.c See: a400edbb6d00c0211de38e4f1b4f593681db91d8 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bce06eb059a22fa1cd76a13112c36a4353894cca --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog