ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Aug 2
12:31:39 2015 +0200| [1ce298dac51cb948a7170ed28e8290530cf150f4] | committer:
Hendrik Leppkes
Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'
* commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db':
x86: dct: Disable dct32_float_sse on x86-64
Conflicts:
libavcodec/x86/dct32.asm
libavcodec/x86/dct_init.c
Merged-by: Hendrik Leppkes <h.lepp...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ce298dac51cb948a7170ed28e8290530cf150f4
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
