Michael Niedermayer 8ccc58bb7d Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavu: Move preprocessor macros in a separate file

Conflicts:
	libavutil/avutil.h
	libavutil/utils.c
	libavutil/version.h

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

2013-12-30 11:23:32 +01:00

3.5 KiB

Raw Blame History

View Raw