[FFmpeg-cvslog] Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 31 13:14:06 2012 +0100| [6ddda83c3f9334511e606d4548a8f13816b71184] | committer: Michael Niedermayer

Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'

* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
  cavs: cosmetics, reformat top part
  cavsdec: cosmetics, reformat
  libavcodec/utils: Add braces to shut up gcc warnings

Conflicts:
	libavcodec/cavsdec.c
	libavcodec/utils.c

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

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