diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:33:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:00:50 +0200 |
| commit | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (patch) | |
| tree | c6f3ad232bed67c703999d78b3fcff66daa8c91d /libpostproc | |
| parent | 3bb22973518cbef28504e4d5b9fd74453cc3339c (diff) | |
| parent | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff) | |
| download | ffmpeg-fb33bff990a8327f59d4c7c509bba1f62bbd6c5a.tar.gz | |
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
| -rw-r--r-- | libpostproc/postprocess.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index da586ffd31..3132d5906b 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -716,10 +716,10 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality) int enable=1; //does the user want us to enabled or disabled the filter filterToken= strtok(p, filterDelimiters); - if(filterToken == NULL) break; + if(!filterToken) break; p+= strlen(filterToken) + 1; // p points to next filterToken filterName= strtok(filterToken, optionDelimiters); - if (filterName == NULL) { + if (!filterName) { ppMode->error++; break; } @@ -732,7 +732,7 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality) for(;;){ //for all options option= strtok(NULL, optionDelimiters); - if(option == NULL) break; + if(!option) break; av_log(NULL, AV_LOG_DEBUG, "pp: option: %s\n", option); if(!strcmp("autoq", option) || !strcmp("a", option)) q= quality; @@ -967,7 +967,7 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3], FFMAX(minStride, c->stride), FFMAX(c->qpStride, absQPStride)); - if(QP_store==NULL || (mode->lumMode & FORCE_QUANT)){ + if(!QP_store || (mode->lumMode & FORCE_QUANT)){ int i; QP_store= c->forcedQPTable; absQPStride = QPStride = 0; |