[FFmpeg-cvslog] Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'

Michael Niedermayer git at videolan.org
Sun Feb 23 22:41:17 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 22:32:51 2014 +0100| [09824332534990be7d08c5cdcebdcd5926e0a739] | committer: Michael Niedermayer

Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'

* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
	configure
	libavutil/x86/cpu.h

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

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





More information about the ffmpeg-cvslog mailing list