summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_syncfb.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2001-12-16 17:01:12 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2001-12-16 17:01:12 +0000
commit9519301052dca9b884dde4c0f482e15c8719d18f (patch)
tree92b8fb2368f2aece779182dca6c5ca24114e37aa /src/video_out/video_out_syncfb.c
parentb0bf7adb2656a4e52889a5bdf1fdec0695e891fc (diff)
downloadxine-lib-9519301052dca9b884dde4c0f482e15c8719d18f.tar.gz
xine-lib-9519301052dca9b884dde4c0f482e15c8719d18f.tar.bz2
- fix clipping box inside rle lines
- removed blend_yuv_vo_frame CVS patchset: 1254 CVS date: 2001/12/16 17:01:12
Diffstat (limited to 'src/video_out/video_out_syncfb.c')
-rw-r--r--src/video_out/video_out_syncfb.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 4b088eb88..613ba5e74 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_syncfb.c,v 1.47 2001/11/18 03:53:24 guenter Exp $
+ * $Id: video_out_syncfb.c,v 1.48 2001/12/16 17:01:12 miguelfreitas Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -855,7 +855,12 @@ static void syncfb_overlay_blend(vo_driver_t* this_gen, vo_frame_t* frame_gen, v
syncfb_frame_t* frame = (syncfb_frame_t *) frame_gen;
if(overlay->rle) {
- blend_yuv_vo_frame(&frame->vo_frame, overlay);
+ if( frame->format == IMGFMT_YV12 )
+ blend_yuv( frame->vo_frame.base[0], overlay, frame->vo_frame.width,
+ frame->vo_frame.height);
+ else
+ blend_yuy2( frame->vo_frame.base[0], overlay, frame->vo_frame.width,
+ frame->vo_frame.height);
}
}