From 0e499e93505e0ecf031ad9584847e353eaff9fb3 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Fri, 12 Jul 2002 20:19:20 +0000 Subject: aa: set *frame function pointers. vidix: more quiet. CVS patchset: 2254 CVS date: 2002/07/12 20:19:20 --- src/video_out/video_out_aa.c | 6 ++++-- src/video_out/video_out_vidix.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index b4a44642b..92e3d87d6 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.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_aa.c,v 1.20 2002/06/12 12:22:38 f1rmb Exp $ + * $Id: video_out_aa.c,v 1.21 2002/07/12 20:19:20 f1rmb Exp $ * * video_out_aa.c, ascii-art output plugin for xine * @@ -119,7 +119,8 @@ static vo_frame_t *aa_alloc_frame(vo_driver_t *this) { frame->vo_frame.copy = NULL; frame->vo_frame.field = aa_frame_field; frame->vo_frame.dispose = aa_dispose_frame; - + frame->vo_frame.driver = this; + return (vo_frame_t*) frame; } @@ -285,6 +286,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->vo_driver.alloc_frame = aa_alloc_frame ; this->vo_driver.update_frame_format = aa_update_frame_format; this->vo_driver.display_frame = aa_display_frame; + this->vo_driver.overlay_blend = NULL; this->vo_driver.get_property = aa_get_property; this->vo_driver.set_property = aa_set_property; this->vo_driver.get_property_min_max = aa_get_property_min_max; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index d6a0b1af0..500da991e 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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_vidix.c,v 1.4 2002/07/10 14:04:42 mroi Exp $ + * $Id: video_out_vidix.c,v 1.5 2002/07/12 20:19:20 f1rmb Exp $ * * video_out_vidix.c * @@ -49,7 +49,7 @@ #include "video_out_x11.h" -#define LOG +#undef LOG #define LIBDIR "/usr/local/lib" -- cgit v1.2.3