Michael Niedermayer 6912e7a008 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c

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

2012-10-20 13:18:59 +02:00

6.0 KiB

Raw Blame History

View Raw