diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:31:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 22:47:45 +0200 |
| commit | 81a663f49edd265dc846ff3854579415cac1d5bb (patch) | |
| tree | 316eba8de3800371865b42b36831e9829bf775f7 /libavcodec | |
| parent | 60dbed6067676d847157fe530b1caed06c77e2ab (diff) | |
| download | ffmpeg-81a663f49edd265dc846ff3854579415cac1d5bb.tar.gz | |
Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/parser.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index ab3d59a272..779358142f 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -314,7 +314,7 @@ static av_cold int X264_close(AVCodecContext *avctx) #define OPT_STR(opt, param) \ do { \ int ret; \ - if (param!=NULL && (ret = x264_param_parse(&x4->params, opt, param)) < 0) { \ + if (param && (ret = x264_param_parse(&x4->params, opt, param)) < 0) { \ if(ret == X264_PARAM_BAD_NAME) \ av_log(avctx, AV_LOG_ERROR, \ "bad option '%s': '%s'\n", opt, param); \ diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index e2523b49ca..c4c03d9106 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1603,7 +1603,7 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples, /* get output buffer */ if (!samples) { - av_assert0(s->frame != NULL); + av_assert0(s->frame); s->frame->nb_samples = s->avctx->frame_size; if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0) return ret; diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 71449ca3ab..55c2f527a2 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -54,7 +54,7 @@ AVCodecParserContext *av_parser_init(int codec_id) if (codec_id == AV_CODEC_ID_NONE) return NULL; - for (parser = av_first_parser; parser != NULL; parser = parser->next) { + for (parser = av_first_parser; parser; parser = parser->next) { if (parser->codec_ids[0] == codec_id || parser->codec_ids[1] == codec_id || parser->codec_ids[2] == codec_id || |