[FFmpeg-cvslog] Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'
Michael Niedermayer
git at videolan.org
Thu Mar 20 22:12:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 21:58:16 2014 +0100| [a87188ebdb8307fb4733e04d482a3ae617bd9da4] | committer: Michael Niedermayer
Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'
* commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e':
arm: dsputil: K&R formatting cosmetics
Conflicts:
libavcodec/arm/dsputil_init_arm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a87188ebdb8307fb4733e04d482a3ae617bd9da4
---
More information about the ffmpeg-cvslog
mailing list