[FFmpeg-devel] [PATCH] Remove AVFilterBuffer.w,h fields.

[Stefano Sabatini]

On date Saturday 2010-07-17 18:47:49 +0200, Michael Niedermayer encoded:
> On Sat, Jul 17, 2010 at 12:53:24PM +0200, Stefano Sabatini wrote:
> > On date Friday 2010-07-16 01:00:16 -0700, S.N. Hemanth Meenakshisundaram encoded:
> > > On 07/16/2010 12:58 AM, S.N. Hemanth Meenakshisundaram wrote:
> > >> On 07/15/2010 04:52 AM, S.N. Hemanth Meenakshisundaram wrote:
> > >>> On 07/14/2010 07:51 AM, Michael Niedermayer wrote:
> > >>>> [...]
> > >>>> to elaborate on this, we need patches that apply to svn.
> > >>>> you can send a patch series so that patch n depends on patches 0..n-1
> > >>>> to be applied before it.
> > >>>> but if patch x (x<n) is changed due to discussions all later patches
> > >>>> must be rebased on the new code. We dont apply bad patches and then
> > >>>> apply fixes on top.
> > >>>>
> > >>>>    
> > >>
> > >> [...]
> > >>
> > >> Am sending the series of patches again with the changes pointed out  
> > >> earlier. [...]
> > >>
> > >> This is for removing redundant fields from common buffer struct.
> > >>
> > >> Regards,
> > >> Hemanth
> > >>
> > >
> > 
> > > diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
> > > index 96df532..c8db36f 100644
> > > --- a/libavfilter/avfilter.h
> > > +++ b/libavfilter/avfilter.h
> > > @@ -85,7 +85,6 @@ typedef struct AVFilterBuffer
> > >       */
> > >      void (*free)(struct AVFilterBuffer *pic);
> > >  
> > > -    int w, h;                  ///< width and height of the allocated buffer
> > >  } AVFilterBuffer;
> > >  
> > >  /**
> > > diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
> > > index cef45b2..c0fe725 100644
> > > --- a/libavfilter/defaults.c
> > > +++ b/libavfilter/defaults.c
> > > @@ -40,8 +40,8 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms,
> > >      char *buf;
> > >  
> > >      ref->pic   = pic;
> > > -    ref->w     = pic->w = w;
> > > -    ref->h     = pic->h = h;
> > > +    ref->w     = w;
> > > +    ref->h     = h;
> > >  
> > >      /* make sure the buffer gets read permission or it's useless for output */
> > >      ref->perms = perms | AV_PERM_READ;
> > 
> > This looks fine to me, assuming that we never used w/h and that that
> > info is video-related, so shouldn't stay in AVFilterBuffer which is
> > generic.
> > 
> > OK to apply?
> 
> if people want the w/h fields removed then i have no objections

Applied.