diff options
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 31ee4567aa..2dda729bab 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1658,7 +1658,7 @@ static int matroska_parse_tracks(AVFormatContext *s) track->type); continue; } - if (track->codec_id == NULL) + if (!track->codec_id) continue; if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { @@ -1735,7 +1735,7 @@ static int matroska_parse_tracks(AVFormatContext *s) } st = track->stream = avformat_new_stream(s, NULL); - if (st == NULL) { + if (!st) { av_free(key_id_base64); return AVERROR(ENOMEM); } @@ -1821,7 +1821,7 @@ static int matroska_parse_tracks(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); @@ -1840,7 +1840,7 @@ static int matroska_parse_tracks(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); @@ -1850,7 +1850,7 @@ static int matroska_parse_tracks(AVFormatContext *s) } else if (codec_id == AV_CODEC_ID_TTA) { extradata_size = 30; extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); - if (extradata == NULL) + if (!extradata) return AVERROR(ENOMEM); ffio_init_context(&b, extradata, extradata_size, 1, NULL, NULL, NULL, NULL); @@ -2130,7 +2130,7 @@ static int matroska_read_header(AVFormatContext *s) av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n"); } else { AVStream *st = avformat_new_stream(s, NULL); - if (st == NULL) + if (!st) break; av_dict_set(&st->metadata, "filename", attachments[j].filename, 0); av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0); @@ -2561,7 +2561,7 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, buf = av_packet_new_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER, id_len); - if (buf == NULL) { + if (!buf) { av_free(pkt); return AVERROR(ENOMEM); } @@ -2572,7 +2572,7 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, buf = av_packet_new_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS, settings_len); - if (buf == NULL) { + if (!buf) { av_free(pkt); return AVERROR(ENOMEM); } @@ -2659,7 +2659,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, additional_size + 8); - if (side_data == NULL) { + if (!side_data) { av_free_packet(pkt); av_free(pkt); return AVERROR(ENOMEM); @@ -2672,7 +2672,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10); - if (side_data == NULL) { + if (!side_data) { av_free_packet(pkt); av_free(pkt); return AVERROR(ENOMEM); @@ -3406,7 +3406,7 @@ static int webm_dash_manifest_read_header(AVFormatContext *s) // basename of the file buf = strrchr(s->filename, '/'); - if (buf == NULL) return -1; + if (!buf) return -1; av_dict_set(&s->streams[0]->metadata, FILENAME, ++buf, 0); // duration |