[FFmpeg-cvslog] Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  9 12:12:29 2014 +0200| [b63052839a6b247bd13daab74a869c8f837eda84] | committer: Michael Niedermayer

Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'

* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
  dirac: K&R formatting cosmetics

Conflicts:
	libavcodec/dirac.c
	libavcodec/dirac_parser.c

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

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