[FFmpeg-cvslog] Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
Michael Niedermayer
git at videolan.org
Thu Oct 24 10:42:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 24 10:32:17 2013 +0200| [1ea28ffc4dbcdda64dc2e774c186f668ef7b030f] | committer: Michael Niedermayer
Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
avfilter: x86: Port gradfun filter optimizations to yasm
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ea28ffc4dbcdda64dc2e774c186f668ef7b030f
---
More information about the ffmpeg-cvslog
mailing list