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 /libavformat/matroskaenc.c | |
| 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 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3ec8ef27a9..7123ec6c96 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -309,7 +309,7 @@ static mkv_seekhead *mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset, int numelements) { mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead)); - if (new_seekhead == NULL) + if (!new_seekhead) return NULL; new_seekhead->segment_offset = segment_offset; @@ -335,7 +335,7 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid return -1; entries = av_realloc_array(entries, seekhead->num_entries + 1, sizeof(mkv_seekhead_entry)); - if (entries == NULL) + if (!entries) return AVERROR(ENOMEM); seekhead->entries = entries; @@ -401,7 +401,7 @@ fail: static mkv_cues *mkv_start_cues(int64_t segment_offset) { mkv_cues *cues = av_mallocz(sizeof(mkv_cues)); - if (cues == NULL) + if (!cues) return NULL; cues->segment_offset = segment_offset; @@ -417,7 +417,7 @@ static int mkv_add_cuepoint(mkv_cues *cues, int stream, int tracknum, int64_t ts return 0; entries = av_realloc_array(entries, cues->num_entries + 1, sizeof(mkv_cuepoint)); - if (entries == NULL) + if (!entries) return AVERROR(ENOMEM); cues->entries = entries; @@ -1336,7 +1336,7 @@ static int mkv_write_header(AVFormatContext *s) mkv_write_seekhead(pb, mkv->main_seekhead); mkv->cues = mkv_start_cues(mkv->segment_offset); - if (mkv->cues == NULL) + if (!mkv->cues) return AVERROR(ENOMEM); if (pb->seekable && mkv->reserve_cues_space) { |