[FFmpeg-cvslog] Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 16:56:42 2014 +0200| [229a1e8694291c4ae77c27293dc57f78b2e3d223] | committer: Michael Niedermayer

Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
  pixdesc: K&R formatting cosmetics

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h

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

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