[FFmpeg-cvslog] Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
Michael Niedermayer
git at videolan.org
Fri Nov 1 10:26:04 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 10:20:20 2013 +0100| [ffe33500983983946048def3a6047920d97d957b] | committer: Michael Niedermayer
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
avfilter: x86: K&R formatting cosmetics
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=ffe33500983983946048def3a6047920d97d957b
---
More information about the ffmpeg-cvslog
mailing list