From 024ccaccf74ce67e59db845efb31293682ea8f51 Mon Sep 17 00:00:00 2001 From: benoit Date: Thu, 17 Jan 2008 15:49:31 +0000 Subject: Change (a == NULL) condition to (!a) and (a != NULL) condition to (a). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25780 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale-example.c | 8 ++++---- libswscale/swscale.c | 26 +++++++++++++------------- libswscale/swscale_template.c | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'libswscale') diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index 124128b377..e53c0b3ebf 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -76,7 +76,7 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat src[i]= (uint8_t*) malloc(srcStride[i]*srcH); dst[i]= (uint8_t*) malloc(dstStride[i]*dstH); out[i]= (uint8_t*) malloc(refStride[i]*h); - if (src[i] == NULL || dst[i] == NULL || out[i] == NULL) { + if (!src[i] || !dst[i] || !out[i]) { perror("Malloc"); res = -1; @@ -86,7 +86,7 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat dstContext = outContext = NULL; srcContext= sws_getContext(w, h, PIX_FMT_YUV420P, srcW, srcH, srcFormat, flags, NULL, NULL, NULL); - if (srcContext == NULL) { + if (!srcContext) { fprintf(stderr, "Failed to get %s ---> %s\n", sws_format_name(PIX_FMT_YUV420P), sws_format_name(srcFormat)); @@ -95,7 +95,7 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat goto end; } dstContext= sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, NULL, NULL, NULL); - if (dstContext == NULL) { + if (!dstContext) { fprintf(stderr, "Failed to get %s ---> %s\n", sws_format_name(srcFormat), sws_format_name(dstFormat)); @@ -104,7 +104,7 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat goto end; } outContext= sws_getContext(dstW, dstH, dstFormat, w, h, PIX_FMT_YUV420P, flags, NULL, NULL, NULL); - if (outContext == NULL) { + if (!outContext) { fprintf(stderr, "Failed to get %s ---> %s\n", sws_format_name(dstFormat), sws_format_name(PIX_FMT_YUV420P)); diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 5a61aedeaf..e0467f4517 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -388,7 +388,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt dest[i]= av_clip_uint8(val>>19); } - if (uDest != NULL) + if (uDest) for (i=0; i>19); } - if (uDest == NULL) + if (!uDest) return; if (dstFormat == PIX_FMT_NV12) @@ -2050,7 +2050,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH #endif #endif /* RUNTIME_CPUDETECT */ if (clip_table[512] != 255) globalInit(); - if (rgb15to16 == NULL) sws_rgb2rgb_init(flags); + if (!rgb15to16) sws_rgb2rgb_init(flags); unscaled = (srcW == dstW && srcH == dstH); needsDither= (isBGR(dstFormat) || isRGB(dstFormat)) @@ -2097,14 +2097,14 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH c->vRounder= 4* 0x0001000100010001ULL; usesHFilter= usesVFilter= 0; - if (dstFilter->lumV!=NULL && dstFilter->lumV->length>1) usesVFilter=1; - if (dstFilter->lumH!=NULL && dstFilter->lumH->length>1) usesHFilter=1; - if (dstFilter->chrV!=NULL && dstFilter->chrV->length>1) usesVFilter=1; - if (dstFilter->chrH!=NULL && dstFilter->chrH->length>1) usesHFilter=1; - if (srcFilter->lumV!=NULL && srcFilter->lumV->length>1) usesVFilter=1; - if (srcFilter->lumH!=NULL && srcFilter->lumH->length>1) usesHFilter=1; - if (srcFilter->chrV!=NULL && srcFilter->chrV->length>1) usesVFilter=1; - if (srcFilter->chrH!=NULL && srcFilter->chrH->length>1) usesHFilter=1; + if (dstFilter->lumV && dstFilter->lumV->length>1) usesVFilter=1; + if (dstFilter->lumH && dstFilter->lumH->length>1) usesHFilter=1; + if (dstFilter->chrV && dstFilter->chrV->length>1) usesVFilter=1; + if (dstFilter->chrH && dstFilter->chrH->length>1) usesHFilter=1; + if (srcFilter->lumV && srcFilter->lumV->length>1) usesVFilter=1; + if (srcFilter->lumH && srcFilter->lumH->length>1) usesHFilter=1; + if (srcFilter->chrV && srcFilter->chrV->length>1) usesVFilter=1; + if (srcFilter->chrH && srcFilter->chrH->length>1) usesHFilter=1; getSubSampleFactors(&c->chrSrcHSubSample, &c->chrSrcVSubSample, srcFormat); getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat); @@ -2964,7 +2964,7 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, if (!param) param = default_param; - if (context != NULL) { + if (context) { if (context->srcW != srcW || context->srcH != srcH || context->srcFormat != srcFormat || context->dstW != dstW || context->dstH != dstH || @@ -2975,7 +2975,7 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, context = NULL; } } - if (context == NULL) { + if (!context) { return sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, srcFilter, dstFilter, param); diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 526dd6ea49..8bc637bffc 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -973,7 +973,7 @@ static inline void RENAME(yuv2yuv1)(int16_t *lumSrc, int16_t *chrSrc, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, long dstW, long chrDstW) { #ifdef HAVE_MMX - if (uDest != NULL) + if (uDest) { asm volatile( YSCALEYUV2YV121 @@ -1010,7 +1010,7 @@ static inline void RENAME(yuv2yuv1)(int16_t *lumSrc, int16_t *chrSrc, dest[i]= val; } - if (uDest != NULL) + if (uDest) for (i=0; i>7; -- cgit v1.2.3