Michael Niedermayer 7d43fbe3ae 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>

2014-09-16 20:31:02 +02:00

3.8 KiB

Raw Blame History

View Raw