[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.80,1.81

[Arpi of Ize]

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

Modified Files:
	vd_ffmpeg.c 
Log Message:
i hate asserts


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- vd_ffmpeg.c	28 Dec 2002 00:01:28 -0000	1.80
+++ vd_ffmpeg.c	28 Dec 2002 12:14:57 -0000	1.81
@@ -411,10 +411,11 @@
     pic->data[0]= mpi->planes[0];
     pic->data[1]= mpi->planes[1];
     pic->data[2]= mpi->planes[2];
-    
-    assert(mpi->w >= ((width +align)&(~align)));
-    assert(mpi->h >= ((height+align)&(~align)));
-    assert(mpi->stride[0] >= mpi->w);
+
+#if 0    
+    assert(mpi->width >= ((width +align)&(~align)));
+    assert(mpi->height >= ((height+align)&(~align)));
+    assert(mpi->stride[0] >= mpi->width);
     if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){
         const int y_size= mpi->stride[0] * (mpi->h-1) + mpi->w;
         const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1);
@@ -426,6 +427,7 @@
         assert(mpi->planes[2] > mpi->planes[0] || mpi->planes[2] + c_size <= mpi->planes[0]);
         assert(mpi->planes[2] > mpi->planes[1] || mpi->planes[2] + c_size <= mpi->planes[1]);
     }
+#endif
 
     /* Note, some (many) codecs in libavcodec must have stride1==stride2 && no changes between frames
      * lavc will check that and die with an error message, if its not true