ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 8 20:58:13 2015 +0200| [db8ae37a783aba18d8f869dae1824a3e3f984bf8] | committer: Michael Niedermayer
Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8' * commit 'da0c8664b4dc906696803685f7e53ade68594ab8': mpegvideo: Move various temporary buffers to a separate context Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/vc1_mc.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db8ae37a783aba18d8f869dae1824a3e3f984bf8 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog