From 76491f577272439c53ac30c049dcadb10bd2da6d Mon Sep 17 00:00:00 2001 From: Niels Elburg Date: Fri, 10 Jul 2009 17:27:30 +0000 Subject: [PATCH] strict on sws git-svn-id: svn://code.dyne.org/veejay/trunk@1343 eb8d1916-c9e9-0310-b8de-cf0c9472ead5 --- .../veejay-server/libel/vj-avcodec.c | 10 ++++----- veejay-current/veejay-server/libyuv/yuvconv.c | 22 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/veejay-current/veejay-server/libel/vj-avcodec.c b/veejay-current/veejay-server/libel/vj-avcodec.c index 99622081..fcb0f9ab 100644 --- a/veejay-current/veejay-server/libel/vj-avcodec.c +++ b/veejay-current/veejay-server/libel/vj-avcodec.c @@ -460,11 +460,11 @@ void *vj_avcodec_start( editlist *el, int encoder, char *filename ) int vj_avcodec_init( int pixel_format, int verbose) { out_pixel_format = pixel_format; - if( !verbose ) - av_log_set_level( AV_LOG_QUIET); - else - av_log_set_level( AV_LOG_VERBOSE ); - +#ifndef STRICT_CHECKING + av_log_set_level( AV_LOG_QUIET); +#else + av_log_set_level( AV_LOG_VERBOSE ); +#endif av_register_all(); veejay_msg(VEEJAY_MSG_INFO, "FFmpeg AVCodec initialized (http://ffmpeg.sourceforge.net)"); diff --git a/veejay-current/veejay-server/libyuv/yuvconv.c b/veejay-current/veejay-server/libyuv/yuvconv.c index 9864f94d..530ff27c 100644 --- a/veejay-current/veejay-server/libyuv/yuvconv.c +++ b/veejay-current/veejay-server/libyuv/yuvconv.c @@ -945,19 +945,22 @@ void* yuv_init_swscaler(VJFrame *src, VJFrame *dst, sws_template *tmpl, int cpu_ veejay_memset( s, 0, sizeof(vj_sws) ); int cpu_flags = 0; +#ifdef STRICT_CHECKING + cpu_flags = cpu_flags | SWS_PRINT_INFO; +#endif #ifdef HAVE_ASM_MMX cpu_flags = cpu_flags | SWS_CPU_CAPS_MMX; #endif -#ifdef HAVE_ASM_3DNOW - cpu_flags = cpu_flags | SWS_CPU_CAPS_3DNOW; -#endif -#ifdef HAVE_ASM_MMX2 - cpu_flags = cpu_flags | SWS_CPU_CAPS_MMX2; -#endif -#ifdef HAVE_ALTIVEC - cpu_flags = cpu_flags | SWS_CPU_CAPS_ALTIVEC; -#endif +//#ifdef HAVE_ASM_3DNOW +// cpu_flags = cpu_flags | SWS_CPU_CAPS_3DNOW; +//#endif +//#ifdef HAVE_ASM_MMX2 +// cpu_flags = cpu_flags | SWS_CPU_CAPS_MMX2; +//#endif +//#ifdef HAVE_ALTIVEC +// cpu_flags = cpu_flags | SWS_CPU_CAPS_ALTIVEC; +//#endif switch(tmpl->flags) { case 1: @@ -1013,6 +1016,7 @@ void* yuv_init_swscaler(VJFrame *src, VJFrame *dst, sws_template *tmpl, int cpu_ if(!s->sws) { + veejay_msg(0,"sws_getContext failed."); if(s)free(s); return NULL; }