Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-12-30 |
| | | | | | | | | | | | | * 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> | ||
* | lavu: Move preprocessor macros in a separate file | Luca Barbato | 2013-12-29 |
And remove all the circular inclusions of avutil.h while at it. |