[FFmpeg-cvslog] Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

Michael Niedermayer git at videolan.org
Tue May 14 12:21:48 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 14 12:01:13 2013 +0200| [a887372109a262263ec04355d30f9834c35ac85f] | committer: Michael Niedermayer

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

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





More information about the ffmpeg-cvslog mailing list