[FFmpeg-cvslog] Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 18:01:03 2013 +0200| [7565aaecb4978cb5903335ffdea5dae21a924494] | committer: Michael Niedermayer

Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

* commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226':
  avformat/dv: K&R formatting cosmetics

Conflicts:
	libavformat/dv.c

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

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