diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 23:31:59 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-16 00:47:45 +0400 |
commit | 81a663f49edd265dc846ff3854579415cac1d5bb (patch) | |
tree | 316eba8de3800371865b42b36831e9829bf775f7 /libavformat | |
parent | 60dbed6067676d847157fe530b1caed06c77e2ab (diff) |
Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/lrcenc.c | 6 | ||||
-rw-r--r-- | libavformat/matroskadec.c | 2 | ||||
-rw-r--r-- | libavformat/mov.c | 2 | ||||
-rw-r--r-- | libavformat/rtpdec_h264.c | 2 | ||||
-rw-r--r-- | libavformat/sctp.c | 2 | ||||
-rw-r--r-- | libavformat/webmdashenc.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index c1afc2ccac..b316ccd6d8 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -64,15 +64,15 @@ static int lrc_write_header(AVFormatContext *s) } for(metadata_item = NULL; (metadata_item = av_dict_get(s->metadata, "", metadata_item, - AV_DICT_IGNORE_SUFFIX)) != NULL;) { + AV_DICT_IGNORE_SUFFIX));) { char *delim; if(!metadata_item->value[0]) { continue; } - while((delim = strchr(metadata_item->value, '\n')) != NULL) { + while((delim = strchr(metadata_item->value, '\n'))) { *delim = ' '; } - while((delim = strchr(metadata_item->value, '\r')) != NULL) { + while((delim = strchr(metadata_item->value, '\r'))) { *delim = ' '; } avio_printf(s->pb, "[%s:%s]\n", diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index dd1478cbf4..09d23f67ed 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1772,7 +1772,7 @@ static int matroska_parse_tracks(AVFormatContext *s) extradata_offset = FFMIN(track->codec_priv.size, 18); } else if (!strcmp(track->codec_id, "A_QUICKTIME") && (track->codec_priv.size >= 86) - && (track->codec_priv.data != NULL)) { + && (track->codec_priv.data)) { fourcc = AV_RL32(track->codec_priv.data + 4); codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc); if (ff_codec_get_id(ff_codec_movaudio_tags, AV_RL32(track->codec_priv.data))) { diff --git a/libavformat/mov.c b/libavformat/mov.c index 767833ed05..a531fd47c8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3081,7 +3081,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) } ptr = buffer; - while ((ptr = av_stristr(ptr, "systemBitrate=\"")) != NULL) { + while ((ptr = av_stristr(ptr, "systemBitrate=\""))) { ptr += sizeof("systemBitrate=\"") - 1; c->bitrates_count++; c->bitrates = av_realloc_f(c->bitrates, c->bitrates_count, sizeof(*c->bitrates)); diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 51704aaf73..4dbbae770b 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -71,7 +71,7 @@ static int sdp_parse_fmtp_config_h264(AVFormatContext *s, { AVCodecContext *codec = stream->codec; assert(codec->codec_id == AV_CODEC_ID_H264); - assert(h264_data != NULL); + assert(h264_data); if (!strcmp(attr, "packetization-mode")) { av_log(s, AV_LOG_DEBUG, "RTP Packetization Mode: %d\n", atoi(value)); diff --git a/libavformat/sctp.c b/libavformat/sctp.c index f88cd2795d..a4406d1e40 100644 --- a/libavformat/sctp.c +++ b/libavformat/sctp.c @@ -98,7 +98,7 @@ static int ff_sctp_recvmsg(int s, void *msg, size_t len, struct sockaddr *from, if (msg_flags) *msg_flags = inmsg.msg_flags; - for (cmsg = CMSG_FIRSTHDR(&inmsg); cmsg != NULL; + for (cmsg = CMSG_FIRSTHDR(&inmsg); cmsg; cmsg = CMSG_NXTHDR(&inmsg, cmsg)) { if ((IPPROTO_SCTP == cmsg->cmsg_level) && (SCTP_SNDRCV == cmsg->cmsg_type)) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 9cc8d1928c..fc77c247c7 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -150,7 +150,7 @@ static int write_adaptation_set(AVFormatContext *s, int as_index) avio_printf(s->pb, " codecs=\"%s\"", get_codec_name(codec->codec_id)); lang = av_dict_get(s->streams[as->streams[0]]->metadata, "language", NULL, 0); - if (lang != NULL) avio_printf(s->pb, " lang=\"%s\"", lang->value); + if (lang) avio_printf(s->pb, " lang=\"%s\"", lang->value); if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { avio_printf(s->pb, " width=\"%d\"", codec->width); |