[MPlayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.144,1.145

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv11900

Modified Files:
	vd_ffmpeg.c 
Log Message:
quicktime fix update
- check for existence of sh->ImageDesc instead of h263 fourcc
- honor -lavdopts lowres


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- vd_ffmpeg.c	25 May 2005 09:20:50 -0000	1.144
+++ vd_ffmpeg.c	25 May 2005 16:29:53 -0000	1.145
@@ -471,9 +471,13 @@
 
     width = avctx->width;
     height = avctx->height;
-    if (sh->bih && sh->format == mmioFOURCC('h','2','6','3')) {
-	width = sh->bih->biWidth;
-	height = sh->bih->biHeight;
+
+    // HACK!
+    // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
+    // use dimensions from BIH to avoid black borders at the right and bottom.
+    if (sh->bih && sh->ImageDesc) {
+	width = sh->bih->biWidth>>lavc_param_lowres;
+	height = sh->bih->biHeight>>lavc_param_lowres;
     }
     
      // it is possible another vo buffers to be used after vo config()