Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 18:31:02 +0000 (20:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 18:31:02 +0000 (20:31 +0200)
commit7d43fbe3aef8594fbc4a07c3990f865bb3e04628
treed88f1137dad069618df484ad7e8ac1c86f77817b
parent9bf260b2d2fc758dc639fad04f03d4752d066af8
parent45ff7c93dd84a254cc96acc589e5ac3d7bd16bce
Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'

* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dca.c
libavcodec/dca_parser.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/dcadsp.c
libavcodec/dcahuff.h