[FFmpeg-cvslog] Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  9 19:28:59 2014 +0200| [96b069450cd037d7e1406859e42f4a1650e31226] | committer: Michael Niedermayer

Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'

* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
  dv: K&R formatting cosmetics

Conflicts:
	libavcodec/dv.c
	libavcodec/dv.h
	libavcodec/dv_profile.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c

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

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