X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fblendbench.c;h=263b404567a0846f4e152ffd9504dec2c6ff6288;hb=ccee49c75601180e6f855383847f70d1caaa4af0;hp=05875207310a0c5fd33f60b7dc8b65a28811fadd;hpb=52c18c4dec68158eedd655e0502820b7d7b6128f;p=vlc diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c index 0587520731..263b404567 100644 --- a/modules/video_filter/blendbench.c +++ b/modules/video_filter/blendbench.c @@ -4,7 +4,7 @@ * Copyright (C) 2007 the VideoLAN team * $Id$ * - * Author: Søren Bøg + * Author: Søren Bøg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,8 +33,8 @@ #include #include -#include "vlc_filter.h" -#include "vlc_image.h" +#include +#include /***************************************************************************** * Local prototypes @@ -60,7 +60,7 @@ static picture_t *Filter( filter_t *, picture_t * ); #define BASE_CHROMA_TEXT N_("Chroma for the base image") #define BASE_CHROMA_LONGTEXT N_("Chroma which the base image will be loaded in") -#define BLEND_IMAGE_TEXT N_("Image which will be blended.") +#define BLEND_IMAGE_TEXT N_("Image which will be blended") #define BLEND_IMAGE_LONGTEXT N_("The image blended onto the base image") #define BLEND_CHROMA_TEXT N_("Chroma for the blend image") @@ -231,7 +231,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if( !p_blend->p_module ) { picture_Release( p_pic ); - vlc_object_detach( p_blend ); vlc_object_release( p_blend ); return NULL; } @@ -245,7 +244,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } time = mdate() - time; - msg_Info( p_filter, "Blended %d images in %f sec.", p_sys->i_loops, + msg_Info( p_filter, "Blended %d images in %f sec", p_sys->i_loops, time / 1000000.0f ); msg_Info( p_filter, "Speed is: %f images/second, %f pixels/second", (float) p_sys->i_loops / time * 1000000, @@ -255,7 +254,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) module_unneed( p_blend, p_blend->p_module ); - vlc_object_detach( p_blend ); vlc_object_release( p_blend ); p_sys->b_done = true;