diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:26:12 +0200 |
| commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
| tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /tests | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
| download | ffmpeg-60dbed6067676d847157fe530b1caed06c77e2ab.tar.gz | |
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/audiogen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/audiogen.c b/tests/audiogen.c index e705061008..8d596b5108 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -177,7 +177,7 @@ int main(int argc, char **argv) return 1; } - if ((ext = strrchr(argv[1], '.')) != NULL && !strcmp(ext, ".wav")) + if ((ext = strrchr(argv[1], '.')) && !strcmp(ext, ".wav")) put_wav_header(sample_rate, nb_channels, 6 * sample_rate); /* 1 second of single freq sine at 1000 Hz */ |