Michael Niedermayer 309171bea9 Merge commit '3407172b36a93cec410c6a287dbeec0f41257512' ...

* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
	libavformat/avienc.c

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

2014-03-04 22:21:58 +01:00

23 KiB

Raw Blame History

View Raw