Michael Niedermayer 896d6a7736 Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654' ...

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
	libavformat/utils.c

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

2014-01-26 23:35:38 +01:00

13 KiB

Raw Blame History

View Raw