[Ffmpeg-devel] Header installation seems to be broken in SVN HEAD

[Reimar Doeffinger]

Hello,
On Wed, Jul 19, 2006 at 10:30:57AM +0100, M?ns Rullg?rd wrote:
> ?smail D?nmez said:
> > /usr/include/ffmpeg/avutil.h:29:17: log.h: No such file or directory

Not my fault. ;-)

> > /usr/include/ffmpeg/common.h:158:23: bswap.h: No such file or directory

But that one is.

[...]
> Reimar made the config.h/internal.h shuffle.  Reimar, did you break
> something?

Depends on your definition of "break" :-P
bswap.h is included unconditionally by common.h, which might have been a
bad choice since it overwrites stuff from byteswap.h.
But I find that very hard to decide because I don't know of any application
except ffmpeg and my specially-ugly-hacked MPlayer using libavutil so far.
Attached patch would be one simple way to fix it.
Installing it _might_ be a good idea anyway, since it is duplicate code
from MPlayer, and that might be way to get rid of that (though as I
mentioned in another thread I'm having problems combining libswscale and
libavutil, due to libswscale being compiled with -DHAVE_AV_CONFIG_H but
not using av_malloc etc.).

Greetings,
Reimar Doeffinger
-------------- next part --------------
Index: libavutil/internal.h
===================================================================
--- libavutil/internal.h	(revision 5787)
+++ libavutil/internal.h	(working copy)
@@ -14,6 +14,8 @@
 #        define ENODATA  61
 #    endif
 
+#include "bswap.h"
+
 #include <stddef.h>
 #ifndef offsetof
 # define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F))
Index: libavutil/common.h
===================================================================
--- libavutil/common.h	(revision 5787)
+++ libavutil/common.h	(working copy)
@@ -155,8 +155,6 @@
 #endif
 
 
-#    include "bswap.h"
-
 #ifdef HAVE_AV_CONFIG_H
 /* only include the following when compiling package */
 #    include "internal.h"