[FFmpeg-cvslog] Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
Michael Niedermayer
git at videolan.org
Wed Jan 8 05:20:51 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 8 05:13:25 2014 +0100| [9ef7c0c5510fb79c44291cc57c490fbb7f70f998] | committer: Michael Niedermayer
Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f':
arm: cosmetics: Reindent the h264dsp neon init function
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ef7c0c5510fb79c44291cc57c490fbb7f70f998
---
More information about the ffmpeg-cvslog
mailing list