Merge from 1.2 main branch.

5 files changed, 20 insertions, 98 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 913fed7cd..c2ea443e0 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -10,7 +10,7 @@ if ENABLE_MACOSX_VIDEO
 SUBDIRS += macosx
 endif
 
-EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m
+EXTRA_DIST = video_out_directx.c video_out_macosx.m
 
 noinst_HEADERS = video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h
 
@@ -175,13 +175,13 @@ xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 xineplug_vo_out_fb_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS)
 
-xineplug_vo_out_directfb_la_SOURCES = video_out_directfb_fb.c
+xineplug_vo_out_directfb_la_SOURCES = video_out_directfb.c
 xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
 xineplug_vo_out_directfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS) -fno-strict-aliasing
 
-xineplug_vo_out_xdirectfb_la_SOURCES = video_out_directfb_x.c $(X11OSD)
+xineplug_vo_out_xdirectfb_la_SOURCES = video_out_directfb.c $(X11OSD)
 xineplug_vo_out_xdirectfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
-xineplug_vo_out_xdirectfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS) -fno-strict-aliasing
+xineplug_vo_out_xdirectfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS) -fno-strict-aliasing -DDIRECTFB_X11
 
 xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c
 xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 5323c3a5e..d2b488f5b 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -87,12 +87,9 @@ static uint32_t aa_get_capabilities (vo_driver_t *this) {
 static void aa_dispose_frame (vo_frame_t *vo_img) {
   aa_frame_t *frame = (aa_frame_t *)vo_img;
   
-  if (frame->mem[0])
-    free (frame->mem[0]);
-  if (frame->mem[1])
-    free (frame->mem[1]);
-  if (frame->mem[2])
-    free (frame->mem[2]);
+  free (frame->mem[0]);
+  free (frame->mem[1]);
+  free (frame->mem[2]);
 
   free (frame);
 }
@@ -132,19 +129,9 @@ static void aa_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
   if ((frame->width != width) || (frame->height != height) 
       || (frame->format != format)) {
 
-    if (frame->mem[0]) {
-      free (frame->mem[0]);
-      frame->mem[0] = NULL;
-    }
-    if (frame->mem[1]) {
-      free (frame->mem[1]);
-      frame->mem[1] = NULL;
-    }
-      
-    if (frame->mem[2]) {
-      free (frame->mem[2]);
-      frame->mem[2] = NULL;
-    }
+    free (frame->mem[0]); frame->mem[0] = NULL;
+    free (frame->mem[1]); frame->mem[1] = NULL;
+    free (frame->mem[2]); frame->mem[2] = NULL;
 
     frame->width  = width;
     frame->height = height;
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index fe357cbd4..d40ad06e3 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -94,15 +94,11 @@ static uint32_t caca_get_capabilities (vo_driver_t *this) {
 static void caca_dispose_frame (vo_frame_t *vo_img) {
   caca_frame_t *frame = (caca_frame_t *)vo_img;
   
-  if (frame->mem[0])
-    free (frame->mem[0]);
-  if (frame->mem[1])
-    free (frame->mem[1]);
-  if (frame->mem[2])
-    free (frame->mem[2]);
-
-  if (frame->pixmap_d)
-    free (frame->pixmap_d);
+  free (frame->mem[0]);
+  free (frame->mem[1]);
+  free (frame->mem[2]);
+
+  free (frame->pixmap_d);
   if (frame->pixmap_s)
     cucul_free_dither (frame->pixmap_s);
 
@@ -148,23 +144,12 @@ static void caca_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
   if ((frame->width != width) || (frame->height != height) 
       || (frame->format != format)) {
 
-    if (frame->mem[0]) {
-      free (frame->mem[0]);
-      frame->mem[0] = NULL;
-    }
-    if (frame->mem[1]) {
-      free (frame->mem[1]);
-      frame->mem[1] = NULL;
-    }
-    if (frame->mem[2]) {
-      free (frame->mem[2]);
-      frame->mem[2] = NULL;
-    }
+    free (frame->mem[0]); frame->mem[0] = NULL;
+    free (frame->mem[1]); frame->mem[1] = NULL;
+    free (frame->mem[2]); frame->mem[2] = NULL;
+
+    free (frame->pixmap_d); frame->pixmap_d = NULL;
 
-    if (frame->pixmap_d) {
-      free (frame->pixmap_d);
-      frame->pixmap_d = NULL;
-    }
     if (frame->pixmap_s) {
       cucul_free_dither (frame->pixmap_s);
       frame->pixmap_s = NULL;
diff --git a/src/video_out/video_out_directfb_fb.c b/src/video_out/video_out_directfb_fb.c
deleted file mode 100644
index b904407c3..000000000
--- a/src/video_out/video_out_directfb_fb.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2007 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- * DirectFB output plugin (console version wrapper)
- */
-
-#undef DIRECTFB_X11
-#include "video_out_directfb.c"
diff --git a/src/video_out/video_out_directfb_x.c b/src/video_out/video_out_directfb_x.c
deleted file mode 100644
index 48f709eae..000000000
--- a/src/video_out/video_out_directfb_x.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2007 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- * DirectFB output plugin (X version wrapper)
- */
-
-#define DIRECTFB_X11
-#include "video_out_directfb.c"