ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19 04:19:58 2014 +0100| [bb7ad47ddf94511eece7e243402e2cf95cddf1df] | committer: Michael Niedermayer
Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4' * commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4': roqvideo: check memory allocations and propagate errors Conflicts: libavcodec/roqvideoenc.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb7ad47ddf94511eece7e243402e2cf95cddf1df --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog