[FFmpeg-cvslog] Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 12:30:15 2013 +0200| [a5a9bcc8760afafb8d8398a2cf6ffe6a1091dbbe] | committer: Michael Niedermayer

Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'

* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
  faxcompr: K&R formatting cosmetics

Conflicts:
	libavcodec/faxcompr.c

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

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