[FFmpeg-cvslog] r29353 - trunk/libswscale/swscale_internal.h

[Diego Biurrun]

On Thu, Jun 11, 2009 at 09:08:44PM +0200, Michael Niedermayer wrote:
> On Thu, Jun 11, 2009 at 07:24:27PM +0200, Diego Biurrun wrote:
> > On Thu, Jun 11, 2009 at 06:44:47PM +0200, Michael Niedermayer wrote:
> > > On Thu, Jun 11, 2009 at 12:19:04PM +0200, diego wrote:
> > > > 
> > > > Log:
> > > > Add libavutil/internal.h #include, required for the DECLARE_ALIGNED macro.
> > > > This fixes swscale-example compilation.
> > > > 
> > > > --- trunk/libswscale/swscale_internal.h	Sun Jun  7 16:42:43 2009	(r29352)
> > > > +++ trunk/libswscale/swscale_internal.h	Thu Jun 11 12:19:04 2009	(r29353)
> > > > @@ -28,6 +28,7 @@
> > > >  #endif
> > > >  
> > > >  #include "libavutil/avutil.h"
> > > 
> > > > +#include "libavutil/internal.h"
> > > 
> > > anyone against me renaming this header to
> > > internal_to_libavutil_under_absolutely_no_circumstances_include_this_outside_libavutil.h
> > > ?
> > 
> > Not #include it outside of a header that does not exist?
> > 
> > Anyway, swscale_internal.h uses the DECLARE_ALIGNED macro, so there is
> > no way around including libavutil/internal.h here.
> 
> after some investigation, this all seems a complex mess ...
> Lets look at this chronologically
> 
> in r20037 | diego | 2006-10-04 
> 2 warnings are fixed by #including swscale_internal.h into swscale-example,
> whatever the correct fix, this commit was wrong,
> swscale-example as an application example has no business to include
> anything internal. This commit made swscale-example depend indirectly
> on DECLARE_ALIGNED
> 
> in r16781 | diego | 2009-01-25
> DECLARE_ALIGNED is moved from mem.h to internal.h breaking the compilation
> of swscale-example
> 
> the rest was then randomly including whatever internal header was required
> to make it compile

I don't see the relevance to the issue at hand.  #including an internal
header only exposes the real problem, which is using parts from such a
header.

Diego