Michael Niedermayer b63052839a Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06' ...

* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
  dirac: K&R formatting cosmetics

Conflicts:
	libavcodec/dirac.c
	libavcodec/dirac_parser.c

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

2014-09-09 12:12:29 +02:00

8.3 KiB

Raw Blame History

View Raw