Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv23978 Modified Files: vd_ffmpeg.c vd_libmpeg2.c vf_pp.c mp_image.h Log Message: passing qscale_type around so the pp code can fix the mpeg2 <<1 thing Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- 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; } Index: vd_libmpeg2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libmpeg2.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- vd_libmpeg2.c 15 Apr 2003 19:02:00 -0000 1.20 +++ vd_libmpeg2.c 18 Apr 2003 13:18:59 -0000 1.21 @@ -150,6 +150,7 @@ mpeg2dec->decoder.quant_store=mpi->qscale; mpeg2dec->decoder.quant_stride=mpi->qstride; mpi->pict_type=type; // 1->I, 2->P, 3->B + mpi->qscale_type= 1; #endif if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && Index: vf_pp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- 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); } Index: mp_image.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/mp_image.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mp_image.h 30 Jan 2003 09:14:58 -0000 1.22 +++ mp_image.h 18 Apr 2003 13:18:59 -0000 1.23 @@ -76,6 +76,7 @@ char * qscale; int qstride; int pict_type; // 0->unknown, 1->I, 2->P, 3->B + int qscale_type; // 0->mpeg1/4/h263, 1->mpeg2 int num_planes; /* these are only used by planar formats Y,U(Cb),V(Cr) */ int chroma_width;