diff options
| author | Gabriel Dume <gabriel.ddx84@gmail.com> | 2014-08-14 16:31:24 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-15 03:18:18 -0700 |
| commit | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (patch) | |
| tree | 5b93402fb37cc43b899451a5d2b65bfc03d7887b /cmdutils.c | |
| parent | efd26bedec9a345a5960dbfcbaec888418f2d4e6 (diff) | |
| download | ffmpeg-f929ab0569ff31ed5a59b0b0adb7ce09df3fca39.tar.gz | |
cosmetics: Write NULL pointer equality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmdutils.c b/cmdutils.c index b208e52d68..b1671a49f5 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -225,7 +225,7 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) win32_argv_utf8 = av_mallocz(sizeof(char *) * (win32_argc + 1) + buffsize); argstr_flat = (char *)win32_argv_utf8 + sizeof(char *) * (win32_argc + 1); - if (win32_argv_utf8 == NULL) { + if (!win32_argv_utf8) { LocalFree(argv_w); return; } @@ -920,7 +920,7 @@ int show_formats(void *optctx, const char *opt, const char *arg) const char *long_name = NULL; while ((ofmt = av_oformat_next(ofmt))) { - if ((name == NULL || strcmp(ofmt->name, name) < 0) && + if ((!name || strcmp(ofmt->name, name) < 0) && strcmp(ofmt->name, last_name) > 0) { name = ofmt->name; long_name = ofmt->long_name; @@ -928,7 +928,7 @@ int show_formats(void *optctx, const char *opt, const char *arg) } } while ((ifmt = av_iformat_next(ifmt))) { - if ((name == NULL || strcmp(ifmt->name, name) < 0) && + if ((!name || strcmp(ifmt->name, name) < 0) && strcmp(ifmt->name, last_name) > 0) { name = ifmt->name; long_name = ifmt->long_name; @@ -937,7 +937,7 @@ int show_formats(void *optctx, const char *opt, const char *arg) if (name && strcmp(ifmt->name, name) == 0) decode = 1; } - if (name == NULL) + if (!name) break; last_name = name; |