---
libavformat/matroskadec.c | 6 +++---
libavformat/matroskaenc.c | 4 ++--
libavformat/mov.c | 6 ++++--
libavformat/mpc8.c | 3 ++-
libavformat/mxg.c | 3 ++-
libavformat/rtpdec_amr.c | 3 ++-
libavformat/sdp.c | 2 +-
7 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d82d94c..56c7fb4 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1635,7 +1635,7 @@ static int matroska_read_header(AVFormatContext *s)
int profile = matroska_aac_profile(track->codec_id);
int sri = matroska_aac_sri(track->audio.samplerate);
extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE);
- if (extradata == NULL)
+ if (!extradata)
return AVERROR(ENOMEM);
extradata[0] = (profile << 3) | ((sri & 0x0E) >> 1);
extradata[1] = ((sri & 0x01) << 7) | (track->audio.channels << 3);
@@ -1654,7 +1654,7 @@ static int matroska_read_header(AVFormatContext *s)
extradata_size = 12 + track->codec_priv.size;
extradata = av_mallocz(extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
- if (extradata == NULL)
+ if (!extradata)
return AVERROR(ENOMEM);
AV_WB32(extradata, extradata_size);
memcpy(&extradata[4], "alac", 4);
@@ -1748,7 +1748,7 @@ static int matroska_read_header(AVFormatContext *s)
} else if (track->codec_priv.data && track->codec_priv.size > 0) {
st->codec->extradata = av_mallocz(track->codec_priv.size +
FF_INPUT_BUFFER_PADDING_SIZE);
- if (st->codec->extradata == NULL)
+ if (!st->codec->extradata)
return AVERROR(ENOMEM);
st->codec->extradata_size = track->codec_priv.size;
memcpy(st->codec->extradata,
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fad1ec4..7fc4150 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -278,7 +278,7 @@ static void put_xiph_size(AVIOContext *pb, int size)
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;
@@ -371,7 +371,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;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6375847..3d97f91 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2091,10 +2091,12 @@ static int mov_read_trak(MOVContext *c, AVIOContext
*pb, MOVAtom atom)
int ret;
st = avformat_new_stream(c->fc, NULL);
- if (!st) return AVERROR(ENOMEM);
+ if (!st)
+ return AVERROR(ENOMEM);
st->id = c->fc->nb_streams;
sc = av_mallocz(sizeof(MOVStreamContext));
- if (!sc) return AVERROR(ENOMEM);
+ if (!sc)
+ return AVERROR(ENOMEM);
st->priv_data = sc;
st->codec->codec_type = AVMEDIA_TYPE_DATA;
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 3564e81..ba92f87 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -296,7 +296,8 @@ static int mpc8_read_seek(AVFormatContext *s, int
stream_index, int64_t timestam
AVStream *st = s->streams[stream_index];
int index = av_index_search_timestamp(st, timestamp, flags);
- if(index < 0) return -1;
+ if (index < 0)
+ return -1;
if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0)
return -1;
ff_update_cur_dts(s, st, st->index_entries[index].timestamp);
diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index 1d1488c..8c81835 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -91,7 +91,8 @@ static uint8_t* mxg_find_startmarker(uint8_t *p, uint8_t *end)
}
for (; p < end; ++p) {
- if (*p == 0xff) return p;
+ if (*p == 0xff)
+ return p;
}
return end;
diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index fd18ff2..ed5cb59 100644
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -41,7 +41,8 @@ struct PayloadContext {
static PayloadContext *amr_new_context(void)
{
PayloadContext *data = av_mallocz(sizeof(PayloadContext));
- if(!data) return data;
+ if (!data)
+ return data;
data->channels = 1;
return data;
}
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 895b9d6..1b8a98a 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -189,7 +189,7 @@ static char *extradata2psets(AVCodecContext *c)
}
psets = av_mallocz(MAX_PSET_SIZE);
- if (psets == NULL) {
+ if (!psets) {
av_log(c, AV_LOG_ERROR, "Cannot allocate memory for the parameter
sets.\n");
av_free(orig_extradata);
return NULL;
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
