[FFmpeg-cvslog] Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 21 11:45:48 2013 +0200| [75fbe41fc61eb8db693d00a529ba7a31830308e1] | committer: Michael Niedermayer

Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
  dsicinav: K&R formatting cosmetics

Conflicts:
	libavcodec/dsicinav.c

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

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