[Mplayer-cvslog] CVS: main/libvo vo_directfb2.c,1.5,1.6 vo_dfbmga.c,1.6,1.7

[Jiri Svoboda CVS]

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

Modified Files:
	vo_directfb2.c vo_dfbmga.c 
Log Message:
fix to compile with DirecFB 0.9.16

Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_directfb2.c	11 Nov 2002 15:20:25 -0000	1.5
+++ vo_directfb2.c	29 Dec 2002 18:07:18 -0000	1.6
@@ -262,8 +262,13 @@
 	    case IMGFMT_BGR24: return  DSPF_RGB24; break;
             case IMGFMT_RGB16: return  DSPF_RGB16; break;
             case IMGFMT_BGR16: return  DSPF_RGB16; break;
+#if DIRECTFBVERSION > 915
+            case IMGFMT_RGB15: return  DSPF_ARGB1555; break;
+            case IMGFMT_BGR15: return  DSPF_ARGB1555; break;
+#else
             case IMGFMT_RGB15: return  DSPF_RGB15; break;
             case IMGFMT_BGR15: return  DSPF_RGB15; break;
+#endif
             case IMGFMT_YUY2:  return  DSPF_YUY2; break;
             case IMGFMT_UYVY:  return  DSPF_UYVY; break;
     	    case IMGFMT_YV12:  return  DSPF_YV12; break;
@@ -1209,8 +1214,11 @@
                 case DSPF_RGB16:
                         vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + 2*x0,pitch);
                         break;
-
+#if DIRECTFBVERSION > 915
+                case DSPF_ARGB1555:
+#else
                 case DSPF_RGB15:
+#endif
                         vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + 2*x0,pitch);
                         break;
 

Index: vo_dfbmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_dfbmga.c	16 Nov 2002 03:02:23 -0000	1.6
+++ vo_dfbmga.c	29 Dec 2002 18:07:18 -0000	1.7
@@ -138,8 +138,13 @@
 	  return "RGB24";
      case DSPF_RGB16:
 	  return "RGB16";
+#if DIRECTFBVERSION > 915
+     case DSPF_ARGB1555:
+	  return "ARGB1555";
+#else
      case DSPF_RGB15:
 	  return "RGB15";
+#endif
      case DSPF_YUY2:
 	  return "YUY2";
      case DSPF_UYVY:
@@ -170,7 +175,11 @@
 	  return DSPF_RGB16;
      case IMGFMT_RGB15:
      case IMGFMT_BGR15:
+#if DIRECTFBVERSION > 915
+	  return DSPF_ARGB1555;
+#else
 	  return DSPF_RGB15;
+#endif
      case IMGFMT_YUY2:
 	  return DSPF_YUY2;
      case IMGFMT_UYVY:
@@ -539,7 +548,11 @@
 			       ((uint8_t *) dst) + pitch * y0 + subframe_pixel_size * x0,
                                pitch );
 	  break;
+#if DIRECTFBVERSION > 915
+     case DSPF_ARGB1555:
+#else
      case DSPF_RGB15:
+#endif
 	  vo_draw_alpha_rgb15( w, h, src, srca, stride,
 			       ((uint8_t *) dst) + pitch * y0 + subframe_pixel_size * x0,
                                pitch );