[FFmpeg-cvslog] Merge commit '14ddbb477faef359983151b763fd8b20e578651b'

Michael Niedermayer git at videolan.org
Mon Oct 14 02:09:54 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 14 02:04:38 2013 +0200| [fb8a10db5d77424774493376b5d0412808bb0491] | committer: Michael Niedermayer

Merge commit '14ddbb477faef359983151b763fd8b20e578651b'

* commit '14ddbb477faef359983151b763fd8b20e578651b':
  cavs: K&R formatting cosmetics

Conflicts:
	libavcodec/cavs.c

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

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





More information about the ffmpeg-cvslog mailing list