[FFmpeg-cvslog] Merge commit 'a65bdceb060628881578afb29df4eb222421381f'

Michael Niedermayer git at videolan.org
Wed Oct 31 14:15:44 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 31 14:08:49 2012 +0100| [4b874fc4fc2739db7a907ce430ac862e625b7387] | committer: Michael Niedermayer

Merge commit 'a65bdceb060628881578afb29df4eb222421381f'

* commit 'a65bdceb060628881578afb29df4eb222421381f':
  x86: mmx2 ---> mmxext in variable names

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b874fc4fc2739db7a907ce430ac862e625b7387
---





More information about the ffmpeg-cvslog mailing list