[FFmpeg-cvslog] r29354 - trunk/libswscale/swscale-example.c

[Diego Biurrun]

On Thu, Jun 11, 2009 at 10:34:46PM +0200, Diego Biurrun wrote:
> On Thu, Jun 11, 2009 at 10:02:12PM +0200, Michael Niedermayer wrote:
> > On Thu, Jun 11, 2009 at 09:54:50PM +0200, Diego Biurrun wrote:
> > > On Thu, Jun 11, 2009 at 09:32:05PM +0200, Michael Niedermayer wrote:
> > > > On Thu, Jun 11, 2009 at 09:31:49PM +0200, Diego Biurrun wrote:
> > > > > On Thu, Jun 11, 2009 at 08:42:57PM +0200, Michael Niedermayer wrote:
> > > > > > On Thu, Jun 11, 2009 at 07:27:35PM +0200, Diego Biurrun wrote:
> > > > > > > On Thu, Jun 11, 2009 at 06:41:41PM +0200, Michael Niedermayer wrote:
> > > > > > > > On Thu, Jun 11, 2009 at 06:08:35PM +0200, Diego Biurrun wrote:
> > > > > > > > > On Thu, Jun 11, 2009 at 05:46:11PM +0200, Michael Niedermayer wrote:
> > > > > > > > > > On Thu, Jun 11, 2009 at 05:15:43PM +0200, diego wrote:
> > > > > > > > > > > 
> > > > > > > > > > > Log:
> > > > > > > > > > > Fix compilation: #undef standard library functions that are
> > > > > > > > > > > forbidden within FFmpeg, but allowed in example code.
> > > > > > > > > > 
> > > > > > > > > > this commit is not the correct solution
> > > > > > > > > 
> > > > > > > > > Whoever knows the correct solution shall step forward...
> > > > > > > > 
> > > > > > > > I do, revert your previous commit to swscale (r29353) as well and it works
> > > > > > > 
> > > > > > > No, it does not.
> > > > > > 
> > > > > > yes it does, i tested it before making that claim
> > > > > > 
> > > > > > upon further investigation libavutil/mem.h here contained DECLARE_ALIGNED
> > > > > > and was in C state, svn skiped it during updates
> > > > > > 
> > > > > > now if you also revert your r16781 commit, swscale-example.c compiles
> > > > > > 
> > > > > > to quote your commit message from r16781:
> > > > > >     Move DECLARE_ALIGNED and DECLARE_ASM_CONST to internal.h.
> > > > > >     Their definition depends on preprocessor directives from config.h,
> > > > > >     thus they cannot be declared in a public header since public headers
> > > > > >     cannot #include config.h.
> > > > > > 
> > > > > > internal.h is no public header -> it cannot be used outside libavutil
> > > > > > but DECLARE_ALIGNED is used all over the place outside libavutil
> > > > > 
> > > > > So in summary, as I said, reverting my commits is not the correct
> > > > > solution.  
> > > > 
> > > > iam not saying that blindly reverting them is the correct solution
> > > > but i belive the correct solution will involve reverting them
> > > > 
> > > > 
> > > > > Go flame whoever introduced DECLARE_ALIGNED into example
> > > > > code.
> > > > 
> > > > you did in r20037
> > > 
> > > No:
> > > 
> > > silver:/var/tmp/mplayer_vanilla $ svn diff -c 20037
> > > --- libswscale/swscale-example.c        (revision 20036)
> > > +++ libswscale/swscale-example.c        (revision 20037)
> > > @@ -25,6 +25,8 @@
> > >  #undef HAVE_AV_CONFIG_H
> > >  #include "avutil.h"
> > >  #include "swscale.h"
> > > +#include "swscale_internal.h"
> > > +#include "rgb2rgb.h"
> > 
> > grep -c DECLARE_AL libswscale/swscale-example.c
> > 0
> > grep -c DECLARE_AL libswscale/swscale_internal.h 
> > 28
> > 
> > so yes, your #include swscale_internal.h introduced them
> 
> That was necessary because swscale-example uses sws_format_name and
> isALPHA, which are declared/defined in swscale_internal.h...

Here are the offending commits:

------------------------------------------------------------------------
r29013 | sdrik | 2009-03-20 15:17:20 +0100 (Fri, 20 Mar 2009) | 1 line
Changed paths:
   M /trunk/libswscale/swscale-example.c

Also test the alpha channel in swscale-example
------------------------------------------------------------------------

------------------------------------------------------------------------
r19965 | lucabe | 2006-09-24 11:55:18 +0200 (Sun, 24 Sep 2006) | 3 lines
Changed paths:
   M /trunk/libswscale/swscale-example.c

Improve swscale-example to test conversions between all the possible
pixel formats
------------------------------------------------------------------------

------------------------------------------------------------------------
r19148 | lucabe | 2006-07-20 14:13:57 +0200 (Thu, 20 Jul 2006) | 2 lines
Changed paths:
   M /trunk/libswscale/rgb2rgb.c
   M /trunk/libswscale/swscale-example.c
   M /trunk/libswscale/swscale.c
   M /trunk/libswscale/swscale.h
   M /trunk/libswscale/swscale_internal.h
   M /trunk/libswscale/yuv2rgb.c
   M /trunk/libswscale/yuv2rgb_altivec.c

Use libavutil in libswscale, and allow it to be built out of the mplayer
tree
------------------------------------------------------------------------

Diego