Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:25:12 +0000 (10:25 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:25:12 +0000 (10:25 +0100)
commit4cf66a81932a1f3775b8952ebe010be067990674
tree2665e8ac28958bebbb5bca1c42a8bd9904ab3c46
parent40231a58a0d8bffbe2264fe980483edaa6fc422e
parent50078c1c8070dd8d1c329e8117ff30ec72489039
Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'

* commit '50078c1c8070dd8d1c329e8117ff30ec72489039':
  libavutil: move FFALIGN macro from common.h to macros.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/common.h
libavutil/internal.h
libavutil/lls.c
libavutil/lls.h
libavutil/macros.h