Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Dec 2012 12:14:06 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Dec 2012 12:14:06 +0000 (13:14 +0100)
commit6ddda83c3f9334511e606d4548a8f13816b71184
tree21d70bff385aecb551120ab3e8d51f51eec7cd63
parent87350d6b44b245d6b8cd28dc499d0fb9dbf15dad
parent64bb3fa6b7f5b2db22b7577585d5861be24eebd8
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@gmx.at>
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/utils.c