From b33bb28ea3218399d6023a8f3fd2f9a86a3dec41 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 30 Jul 2011 19:03:20 +0300 Subject: build: fix --enable-debug, remove some "#ifdef MP_DEBUG" Recent commit 5d5ca22a6d ("options: commandline: accept --foo=xyz style options") left some bad code under "#ifdef MP_DEBUG" in playtree.c, which caused a compilation failure if configured with "--enable-debug". Fix this. Having the "#ifdef MP_DEBUG" there was completely unnecessary; it only increased the risk for this kind of problems for no real benefit - executing the asserts under it would have no noticeable performance or other penalty in default builds either. Remove several cases of such harmful "#ifdef MP_DEBUG". --- libmpcodecs/vf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 7c84a49ef0..d7ecb2deaa 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -19,16 +19,13 @@ #include #include #include +#include #include "config.h" #if HAVE_MALLOC_H #include #endif -#ifdef MP_DEBUG -#include -#endif - #include "mp_msg.h" #include "m_option.h" #include "m_struct.h" @@ -270,12 +267,10 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int w2; int number = mp_imgtype >> 16; -#ifdef MP_DEBUG assert(w == -1 || w >= vf->w); assert(h == -1 || h >= vf->h); assert(vf->w > 0); assert(vf->h > 0); -#endif // fprintf(stderr, "get_image: %d:%d, vf: %d:%d\n", w,h,vf->w,vf->h); -- cgit v1.2.3