[FFmpeg-cvslog] Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'

Sun, 31 May 2015 15:08:38 -0700 

ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun May 31 
23:57:50 2015 +0200| [c140227a8bbc2699b724c9076dc706400eb5cccd] | committer: 
Michael Niedermayer

Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'

* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
        doc/APIchanges
        libavutil/version.h

See: c312bfac4c8ac1ac55d6648fd6eb36db436100f3
Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to