[FFmpeg-cvslog] Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'

Michael Niedermayer git at videolan.org
Thu Jul 17 22:19:31 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 17 21:55:37 2014 +0200| [d6676a16057576e1a0ee66ae89963ec54f632919] | committer: Michael Niedermayer

Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'

* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
  x86: dsputil: Coalesce all init files

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_x86.h
	libavcodec/x86/motion_est.c

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

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





More information about the ffmpeg-cvslog mailing list