[Mplayer-cvslog] CVS: main/libmpcodecs vf_pp.c,1.27,1.28 vd_ffmpeg.c,1.86,1.87

Michael Niedermayer CVS michael at mplayerhq.hu
Sat Apr 19 00:13:00 CEST 2003


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv23234

Modified Files:
	vf_pp.c vd_ffmpeg.c 
Log Message:
support old libavcodec 


Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vf_pp.c	18 Apr 2003 13:18:59 -0000	1.27
+++ vf_pp.c	18 Apr 2003 22:12:36 -0000	1.28
@@ -129,7 +129,11 @@
 		    (mpi->w+7)&(~7),mpi->h,
 		    mpi->qscale, mpi->qstride,
 		    vf->priv->ppMode[ vf->priv->pp ], vf->priv->context,
+#ifdef PP_PICT_TYPE_QP2
 		    mpi->pict_type | (mpi->qscale_type ? PP_PICT_TYPE_QP2 : 0));
+#else
+		    mpi->pict_type);
+#endif
     }
     return vf_next_put_image(vf,vf->priv->dmpi);
 }

Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vd_ffmpeg.c	18 Apr 2003 13:18:59 -0000	1.86
+++ vd_ffmpeg.c	18 Apr 2003 22:12:36 -0000	1.87
@@ -662,7 +662,9 @@
     mpi->qscale =pic->qscale_table;
     mpi->qstride=pic->qstride;
     mpi->pict_type=pic->pict_type;
+#if LIBAVCODEC_BUILD >= 4664
     mpi->qscale_type= pic->qscale_type;
+#endif
     
     return mpi;
 }



More information about the MPlayer-cvslog mailing list