[libav-devel] [PATCH 02/13] libavutil: internal.h: include common.h for FFALIGN

Martin Storsjö martin at martin.st
Thu Dec 10 17:38:49 CET 2015


On Thu, 10 Dec 2015, Janne Grunau wrote:

> On 2015-12-10 15:34:19 +0200, Martin Storsjö wrote:
>> On Wed, 9 Dec 2015, Janne Grunau wrote:
>>
>>> ---
>>> libavutil/internal.h | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/libavutil/internal.h b/libavutil/internal.h
>>> index 4264c4e..dc38417 100644
>>> --- a/libavutil/internal.h
>>> +++ b/libavutil/internal.h
>>> @@ -36,6 +36,7 @@
>>> #include <assert.h>
>>> #include "config.h"
>>> #include "attributes.h"
>>> +#include "common.h"
>>> #include "dict.h"
>>> #include "pixfmt.h"
>>>
>>> --
>>> 2.6.4
>>
>> Hmm, I remember some effort some years ago to decouple these, see
>> 2ed6f3994. (FFALIGN wasn't used within internal.h at that point, it
>> was only added later, in 218aefce.)
>
> An alternative could be moving FFALIGN out of common.h.
> libavutil/macros.h looks like a good match. It's already included
> (indirectly through version.h) in common.h so consumers common.h won't
> notice a change. It should be then of course included explicitly in
> common.h.

That sounds ok to me.

// Martin


More information about the libav-devel mailing list