[FFmpeg-cvslog] Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
Michael Niedermayer
git at videolan.org
Wed Oct 16 15:06:34 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 14:51:00 2013 +0200| [8210e3846129c6be11322cefa85651bfcf85c257] | committer: Michael Niedermayer
Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8210e3846129c6be11322cefa85651bfcf85c257
---
More information about the ffmpeg-cvslog
mailing list