summaryrefslogtreecommitdiff
path: root/libavutil/macros.h
Commit message (Collapse)AuthorAge
* Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'Hendrik Leppkes2016-01-02
|\ | | | | | | | | | | | | * commit '50078c1c8070dd8d1c329e8117ff30ec72489039': libavutil: move FFALIGN macro from common.h to macros.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libavutil: move FFALIGN macro from common.h to macros.hJanne Grunau2015-12-14
| | | | | | | | | | | | | | | | | | Include macros.h explicitly in common.h so that external code using FFALIGN does not break. It was already implicitly included through version.h. Include macros.h in lls.h and internal.h for FFALIGN. lls.h was including common.h only for FFALIGN and internal.h was missing the include for FFALIGN. `make checkheaders` did not catch it because it's an internal header.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-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 fileLuca Barbato2013-12-29
And remove all the circular inclusions of avutil.h while at it.