[FFmpeg-cvslog] Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
Michael Niedermayer
git at videolan.org
Fri Nov 1 10:35:24 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 10:26:49 2013 +0100| [fc5fe4804fd2ee9a29de502e9431b12d027c0c89] | committer: Michael Niedermayer
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
gradfun: x86: Factor out common code for some gradfun_filter_line() variants
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=fc5fe4804fd2ee9a29de502e9431b12d027c0c89
---
More information about the ffmpeg-cvslog
mailing list