[FFmpeg-cvslog] Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
Michael Niedermayer
git at videolan.org
Fri Jan 31 14:35:56 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 31 14:29:48 2014 +0100| [de17ccc774eab61300b098f2e151cfb9688cdd6d] | committer: Michael Niedermayer
Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See: 1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de17ccc774eab61300b098f2e151cfb9688cdd6d
---
More information about the ffmpeg-cvslog
mailing list