Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 10:23:32 +0000 (11:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Dec 2013 10:23:32 +0000 (11:23 +0100)
commit8ccc58bb7d72938986745042741f8670a08a082c
treeb70b2dc54c723dccf824cb051d6d89ffcf3f3770
parentd890db5f537bdfc9d73e7fdac1ff4216e5a43fc2
parent9a4c10e3af011dd84d3135090d3ca4212cbad127
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>
libavutil/Makefile
libavutil/avutil.h
libavutil/macros.h
libavutil/utils.c
libavutil/version.h