Michael Niedermayer 6ddda83c3f 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>

2012-12-31 13:14:06 +01:00

86 KiB

Raw Blame History

View Raw