[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.85,1.86 vd_libmpeg2.c,1.20,1.21 vf_pp.c,1.26,1.27 mp_image.h,1.22,1.23

[Diego Biurrun]

This commit broke compilation on Cygwin.  Reversing the relevant parts 
fixes compilation.

>On Fri, Apr 18, 2003 at 03:19:25PM +0200, Michael Niedermayer CVS wrote:
> --- vd_ffmpeg.c	6 Apr 2003 23:37:56 -0000	1.85
> +++ vd_ffmpeg.c	18 Apr 2003 13:18:59 -0000	1.86
> @@ -662,6 +662,7 @@
>      mpi->qscale =pic->qscale_table;
>      mpi->qstride=pic->qstride;
>      mpi->pict_type=pic->pict_type;
> +    mpi->qscale_type= pic->qscale_type;
>      
>      return mpi;
>  }

gcc -c -O4 -march=i586 -mcpu=i586 -pipe -ffast-math -fomit-frame-pointer 
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__CYGWIN__ -I. -Inative 
-I.. -I../libmpdemux -I../loader  -D_GNU_SOURCE -o vd_ffmpeg.o vd_ffmpeg.c
vd_ffmpeg.c: In function `decode':
vd_ffmpeg.c:665: structure has no member named `qscale_type'
make: *** [vd_ffmpeg.o] Error 1

> --- vf_pp.c	15 Mar 2003 18:01:02 -0000	1.26
> +++ vf_pp.c	18 Apr 2003 13:18:59 -0000	1.27
> @@ -129,7 +129,7 @@
>  		    (mpi->w+7)&(~7),mpi->h,
>  		    mpi->qscale, mpi->qstride,
>  		    vf->priv->ppMode[ vf->priv->pp ], vf->priv->context,
> -		    mpi->pict_type);
> +		    mpi->pict_type | (mpi->qscale_type ? PP_PICT_TYPE_QP2 : 0));
>      }
>      return vf_next_put_image(vf,vf->priv->dmpi);
>  }

gcc -c -O4 -march=i586 -mcpu=i586 -pipe -ffast-math -fomit-frame-pointer 
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__CYGWIN__ -I. -Inative 
-I.. -I../libmpdemux -I../loader  -D_GNU_SOURCE -o vf_pp.o vf_pp.c
vf_pp.c: In function `put_image':
vf_pp.c:132: `PP_PICT_TYPE_QP2' undeclared (first use in this function)
vf_pp.c:132: (Each undeclared identifier is reported only once
vf_pp.c:132: for each function it appears in.)
make: *** [vf_pp.o] Error 1