[FFmpeg-cvslog] Merge commit '022184a646896c6b27c6cca387039b030685266e'

Michael Niedermayer git at videolan.org
Thu Mar 20 21:43:44 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 21:30:21 2014 +0100| [adf82fe4f71cb7b0875280c3d1679a47394160ee] | committer: Michael Niedermayer

Merge commit '022184a646896c6b27c6cca387039b030685266e'

* commit '022184a646896c6b27c6cca387039b030685266e':
  ppc: dsputil: more K&R formatting cosmetics

Conflicts:
	libavcodec/ppc/gmc_altivec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adf82fe4f71cb7b0875280c3d1679a47394160ee
---





More information about the ffmpeg-cvslog mailing list