[FFmpeg-cvslog] Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'

Michael Niedermayer git at videolan.org
Fri Jul 12 12:41:41 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 12:36:04 2013 +0200| [54bbb9056801b778126a4bf5036d9d3638da1802] | committer: Michael Niedermayer

Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'

* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
  pcx: K&R formatting cosmetics

Conflicts:
	libavcodec/pcx.c

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

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





More information about the ffmpeg-cvslog mailing list