[MPlayer-dev-eng] [PATCH] Remove warnings from libmpcodes/vf_geq.c

[Zuxy Meng]

Hi,

2007/10/17, Diego Biurrun <diego at biurrun.de>:
> On Fri, Oct 12, 2007 at 10:51:39AM +0200, Diego Biurrun wrote:
> > On Fri, Oct 12, 2007 at 11:18:59AM +0800, Zuxy Meng wrote:
> > >
> > > 2007/10/12, Diego Biurrun <diego at biurrun.de>:
> > > > On Thu, Oct 11, 2007 at 06:08:27PM +0800, Zuxy Meng wrote:
> > > > >
> > > > > As $subject. Now we have only 1 warnings instead of 7.
> > > > >
> > > > > --- libmpcodecs/vf_geq.c      ?????? 24763??
> > > > > +++ libmpcodecs/vf_geq.c      ????????????
> > > > > @@ -61,23 +52,6 @@
> > > > >
> > > > > -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
> > > > > -    if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
> > > > > -    // ok, we can do pp in-place (or pp disabled):
> > > > > -    vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
> > > > > -        mpi->type, mpi->flags, mpi->w, mpi->h);
> > > > > -    mpi->planes[0]=vf->dmpi->planes[0];
> > > > > -    mpi->stride[0]=vf->dmpi->stride[0];
> > > > > -    mpi->width=vf->dmpi->width;
> > > > > -    if(mpi->flags&MP_IMGFLAG_PLANAR){
> > > > > -        mpi->planes[1]=vf->dmpi->planes[1];
> > > > > -        mpi->planes[2]=vf->dmpi->planes[2];
> > > > > -        mpi->stride[1]=vf->dmpi->stride[1];
> > > > > -        mpi->stride[2]=vf->dmpi->stride[2];
> > > > > -    }
> > > > > -    mpi->flags|=MP_IMGFLAG_DIRECT;
> > > > > -}
> > > >
> > > > Probably OK, but should be a separate commit.
> > >
> > > Pending...
> >
> > Michael?
>
> Zuxy, commit, I'll share the Cola with you if there are any problems.

Done. What about the remaining part?

Index: vf_geq.c
===================================================================
--- vf_geq.c    （版本 24799）
+++ vf_geq.c    （工作副本）
@@ -166,14 +166,14 @@
             "SH",
             NULL
         };
-        static const char *func2_names[]={
+        static char *func2_names[]={
             "lum",
             "cb",
             "cr",
             "p",
             NULL
         };
-        double (*func2[])(void *, double, double)={
+        double (*func2[])(struct vf_instance_s*, double, double)={
             lum,
             cb,
             cr,


-- 
Zuxy
Beauty is truth,
While truth is beauty.
PGP KeyID: E8555ED6