Michael Niedermayer bad101ab8a Merge commit '89ef08c992c484a46711b1a68a988303679c288e' ...

* commit '89ef08c992c484a46711b1a68a988303679c288e':
  DNxHD: K&R formatting cosmetics

Conflicts:
	libavcodec/dnxhd_parser.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c

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

2014-04-11 14:04:10 +02:00

3.6 KiB

Raw Blame History

View Raw