aboutsummaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-15 20:33:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-15 21:00:50 +0200
commitfb33bff990a8327f59d4c7c509bba1f62bbd6c5a (patch)
treec6f3ad232bed67c703999d78b3fcff66daa8c91d /compat
parent3bb22973518cbef28504e4d5b9fd74453cc3339c (diff)
parentf929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff)
downloadffmpeg-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 'compat')
-rw-r--r--compat/avisynth/avisynth_c.h4
-rw-r--r--compat/getopt.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/compat/avisynth/avisynth_c.h b/compat/avisynth/avisynth_c.h
index 448493b839..2d3002a41c 100644
--- a/compat/avisynth/avisynth_c.h
+++ b/compat/avisynth/avisynth_c.h
@@ -805,7 +805,7 @@ struct AVS_Library {
AVSC_INLINE AVS_Library * avs_load_library() {
AVS_Library *library = (AVS_Library *)malloc(sizeof(AVS_Library));
- if (library == NULL)
+ if (!library)
return NULL;
library->handle = LoadLibrary("avisynth");
if (library->handle == NULL)
@@ -870,7 +870,7 @@ fail:
}
AVSC_INLINE void avs_free_library(AVS_Library *library) {
- if (library == NULL)
+ if (!library)
return;
FreeLibrary(library->handle);
free(library);
diff --git a/compat/getopt.c b/compat/getopt.c
index 9a9c5421de..41a641f7c8 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -54,7 +54,7 @@ static int getopt(int argc, char *argv[], char *opts)
}
}
optopt = c = argv[optind][sp];
- if (c == ':' || (cp = strchr(opts, c)) == NULL) {
+ if (c == ':' || !(cp = strchr(opts, c))) {
fprintf(stderr, ": illegal option -- %c\n", c);
if (argv[optind][++sp] == '\0') {
optind++;