diff options
| author | Gabriel Dume <gabriel.ddx84@gmail.com> | 2014-08-14 16:31:25 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-15 05:34:13 -0700 |
| commit | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (patch) | |
| tree | d5281695ec758c21ed6c0df8e3c03433bca28d18 /libavformat/matroskadec.c | |
| parent | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff) | |
| download | ffmpeg-4b1f5e5090abed6c618c8ba380cd7d28d140f867.tar.gz | |
cosmetics: Write NULL pointer inequality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b168bdf9a6..42204a4acf 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1583,7 +1583,7 @@ static int matroska_parse_tracks(AVFormatContext *s) if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && track->codec_priv.size >= 40 && - track->codec_priv.data != NULL) { + track->codec_priv.data) { track->ms_compat = 1; track->video.fourcc = AV_RL32(track->codec_priv.data + 16); codec_id = ff_codec_get_id(ff_codec_bmp_tags, @@ -1591,7 +1591,7 @@ static int matroska_parse_tracks(AVFormatContext *s) extradata_offset = 40; } else if (!strcmp(track->codec_id, "A_MS/ACM") && track->codec_priv.size >= 14 && - track->codec_priv.data != NULL) { + track->codec_priv.data) { int ret; ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size, @@ -1603,7 +1603,7 @@ static int matroska_parse_tracks(AVFormatContext *s) extradata_offset = FFMIN(track->codec_priv.size, 18); } else if (!strcmp(track->codec_id, "V_QUICKTIME") && (track->codec_priv.size >= 86) && - (track->codec_priv.data != NULL)) { + (track->codec_priv.data)) { track->video.fourcc = AV_RL32(track->codec_priv.data); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, track->video.fourcc); |