[FFmpeg-cvslog] Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'

Michael Niedermayer git at videolan.org
Wed Sep 3 22:23:06 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 22:03:21 2014 +0200| [75a9859ac67b60105769fda7160db081216b70f2] | committer: Michael Niedermayer

Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'

* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
  wma: K&R formatting cosmetics

Conflicts:
	libavcodec/wma.c
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

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

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





More information about the ffmpeg-cvslog mailing list