ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1 02:37:30 2015 +0200| [f24b7d7616533cd00475d7bf93f3a33ff5ac40dc] | committer: Michael Niedermayer
Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab' * commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab': svq1: Check memory allocation Conflicts: libavcodec/svq1enc.c See: 2a3af77284412b56eb0085f4b97d9db5aa04a64f Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f24b7d7616533cd00475d7bf93f3a33ff5ac40dc --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog