Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 10:12:29 +0000 (12:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Sep 2014 10:12:29 +0000 (12:12 +0200)
commitb63052839a6b247bd13daab74a869c8f837eda84
treef4960ae9f6110190f83c7bf1533a97ae68ff09fc
parentf7bbe0f414f8cd495798522c61aec750ebdcf913
parent9752d07d33d5370f7819865fbb5e582b982aad06
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>
libavcodec/dirac.c
libavcodec/dirac_parser.c